Merge pull request #39 from pmills88/SideBar

Finishing touches
Merge pull request #41 from pmills88/Devise

Devise
added signin button, and linked to devise
Merge pull request #42 from sneubig/addSigninButton

added signin button, and linked to devise
Change User Weather Description
Fix merge conflicts
Merge pull request #43 from brandonjyuhas/weather_codes

Weather codes