merge
 fixed gemfile
issue with gemfile fixed upon merge
up to date
changed rake task
gitignore gemfile.lock added
added time zone column to db
Merge branch 'master' of github.com:kylefdoherty/weather-app
handling user time input correctly
using current method for get_users
gemfile
changes for merge
configures bootstrap
Merge branch 'master' of heroku.com:needanumbrella
updating /config/database
undoes previous changes
updates production file and beginning d3
restructures form for new user
rid of passwords until later