formatiing HP
weather edits
Merge pull request #24 from callapatel/callap

Callap
fix merge for calendar