overwrite changes
Merge branch 'master' of github.com:cristylk/weather-app
Updated style and layouts.erb