Merge branch 'master' of github.com:pmills88/Project-2
Merge branch 'master' of github.com:pmills88/Project-2
Merge branch 'master' of github.com:pmills88/Project-2
Misc Changes
Merge branch 'master' of github.com:pmills88/Project-2
Misc Changes
Merge pull request #41 from pmills88/Devise

Devise
Merge branch 'master' of github.com:pmills88/Project-2
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
Working on finding/sending movie info
Fix merge conflicts
Merge pull request #43 from brandonjyuhas/weather_codes

Weather codes
Fix Sidebar
Merge pull request #44 from brandonjyuhas/fix_sidebar

Fix Sidebar
add random style
Sunny day movies message ready to test
merge issue
Merge pull request #45 from Elwend/master

Liz