incorporates Cameron's Saturday night changes, bootstrap, about page and more
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector

Updates Lisa's master with Cameron's Sunday work
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector

updating with cameron's reorganization
migrates database
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector

Merging timezone update
adds user model, associates user with price queries
Merge pull request #26 from lisavogtsf/master

adds user model, associates user with price queries
Merge pull request #27 from lisavogtsf/master

adds user model, associates user with price queries
some changes
fix merge conflict
fix merge conflict
Merge pull request #28 from cameronjacoby/master

some commits to fix my merge conflicts
implement full crud for users
Merge pull request #29 from cameronjacoby/master

implement full crud for users
updates schema to keep up with changes to price query model
adds sessions controller, new view
adds sessions controller and authenticate methods
Merge pull request #31 from lisavogtsf/master

adds sessions controller, login view, authenticate method
changes to price query rb