display calendar
Merge branch 'master' into crystal
Merge pull request #24 from callapatel/callap

Callap
fix merge for calendar
Merge pull request #25 from callapatel/crystal

Crystal
rounded to i in weather helper