Weather
Merge branch 'master' of https://github.com/ChrisGoodwin/WeatherApp

Conflicts:
	index.html