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
Merge pull request #26 from lisavogtsf/master

adds user model, associates user with price queries