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
res is now 1000
res is now 1500
res is now 1900
Change the wholw line
Change variable
res is now 7
change to 1000
change to 1000
res is now 820
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/state/MainGame.java
res is now 9320
change to 55555
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/state/MainGame.java
Revert "Intial Project Setup"

This reverts commit 60aab4240629f5c748ccc2d0dbf8675e90b7d08c.
Intial Project Setup