Weather
Merge branch 'master' of https://github.com/xxahtixx/aad2Project into Master2

Conflicts:
	src/com/example/aad2project/services/WeatherService.java