Merge branch 'develop' into feature/weather_and_locations_page
Merge branch 'develop' into feature/weather_and_locations_page
last commit before removing Locations model and controller
coflict on the home page resolved
Merge branch 'develop' into feature/weather_and_locations_page
Locations have snow reports and current temperatures
Merge branch 'feature/weather_and_locations_page' into develop