Merge branch 'master' of https://github.com/KingMike920/WeatherApp into test

Conflicts:
	readme.txt
Merge branch 'master' of https://github.com/KingMike920/WeatherApp into test

Conflicts:
	readme.txt