change to 55555
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/state/MainGame.java