merge
 fixed gemfile
issue with gemfile fixed upon merge
gitignore gemfile.lock added
Merge branch 'master' of github.com:kylefdoherty/weather-app
gemfile
changes for merge