Actually fixed the weather system this time
Merge branch 'master' of https://github.com/kyranstar/DwarfGame.git

Conflicts:
	Game/src/game/map/GameMap.java
	Game/src/game/map/weather/Weather.java