GameState update
done
done
minor fix
minor fix
Merge remote-tracking branch 'remotes/origin/master' into GameStateRedesign

Conflicts:
	src/run/Program.java