time now to_date
resolved merge conflict
Merge branch 'master' of github.com:mikobautista/BattleStocks
password reset
changed contact email
precompiled assets
reset
cleaned assets
precompiled assets