function hasEnded() public constant returns (bool) {
        if (currentTime() > endTimestamp)
      return true;
        if (tokenRaised >= tokensForSale)
      return true; 
        return false;
    }