Got Milk!
Merge branch 'master' of github.com:m15399/CatWonderland

Conflicts:
	src/Game/EarthLevel.java
	src/Game/Resources.java