Cat animation
Merge branch 'master' of https://github.com/m15399/CatWonderland

Conflicts:
	src/Game/Resources.java