Weather
Merge branch 'Toscan'

Conflicts:
	src/com/example/aad2project/model/WeatherDao.java