GameState edited
Merge branch 'master' of https://github.com/dari-ta/LLC

Conflicts:
	src/llc/logic/GameState.java
Merge branch 'master' of https://github.com/dari-ta/LLC