res is now 7
res is now 820
Merge remote-tracking branch 'origin/dev' into dev

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