api calls added
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector into kevin2
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector into kevin2
incorporates Cameron's Saturday night changes, bootstrap, about page and more
9/1 update
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector

Updates Lisa's master with Cameron's Sunday work
implement search form on homepage for users to filter results by city, day, and uber type
clean up file structure; comment out test code not in use
Merge branch 'data_visualization'
Merge pull request #24 from cameronjacoby/master

implement search form on homepage for users to filter results; clean up file structure; comment out test code not in use
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector

updating with cameron's reorganization
migrates database
big update
scope price results to query's local time
Merge pull request #25 from cameronjacoby/master

scope price results to query's local time
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector

Merging timezone update
bootstrap
merged 9/2 330pm
adds user model, associates user with price queries
Merge pull request #26 from lisavogtsf/master

adds user model, associates user with price queries