Styling
merge issue
merge
Merge branch 'master' of github.com:pmills88/Project-2
commit
Footer and signout styling
Sidebar styling
Styling changes
merge issues
Merge branch 'master' of github.com:Elwend/Project-2

Conflicts:
	app/assets/stylesheets/weather.css
merge
updating
merge
Updated sign up/sign in page
Merge pull request #70 from Elwend/Day4Liz

Day4 liz