changed background color and borders
Fix merge conflicts
Merge pull request #11 from sneubig/fix_merge

Fix merge
Minor bufixes
Conflict fix
add back container divs
Merge pull request #12 from sneubig/styleWeatherIndex3

add back container divs
added side nav bar icon
Added UserWeather migration
added normalize.css and fixed application.css
Further modelling
Merge pull request #13 from sneubig/sideNavBar

added normalize.css and fixed application.css
add mouseover js to nav-icon
Added upon User models
Merge pull request #14 from sneubig/addMouseOver

add mouseover js to nav-icon
Merge pull request #15 from pmills88/PersistTemps

Persist temps
Fixed bug
added the structure of the side menu, still need set default to hidden
Added images to play around with
Merge pull request #17 from sneubig/addSideMenu

added the structure of the side menu, still need set default to hidden