fix merge
Merge branch 'master' of github.com:kylefdoherty/weather-app
gemfile thing
Merge branch 'master' of github.com:kylefdoherty/weather-app
passing to kyle