Minor bufixes
Conflict fix
Added UserWeather migration
Further modelling
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
Merge pull request #17 from sneubig/addSideMenu

added the structure of the side menu, still need set default to hidden
Merge branch 'master' of github.com:pmills88/Project-2
Added Twilio API gem, texting capability template, user cell migration, and required cell to sign up