Merge pull request #25 from callapatel/crystal

Crystal
rounded to i in weather helper
Merge pull request #26 from callapatel/callap

rounded to i in weather helper
events controller
Merge branch 'master' into callap
Merge pull request #27 from callapatel/callap

Callap
drop comments table
cal incremental
Merge branch 'master' into callap
Merge pull request #28 from callapatel/callap

Callap
updated HP, current user now view
Merge pull request #29 from callapatel/callap

updated HP, current user now view
start modal
modal
fix merge conflicts