new test res
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/state/MainGame.java
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/state/MainGame.java
res is now 8000