trying to pull
Merge branch 'master' of https://www.github.com/m15399/CatWonderland

Conflicts:
	src/Game/Director.java
	src/Game/Resources.java
Merge branch 'master' of https://www.github.com/m15399/CatWonderland