adding weather icons
Merge branch 'master' of https://github.com/thejuliekramer/forecast_api

Conflicts:
	app/assets/stylesheets/application.css.erb
	app/views/forecast/index.html.erb