worked more on GameState.java and added a Constants class C.java
Merge branch 'master' of https://github.com/carolinemagnusson/Amazingqwerty

Conflicts:
	src/GameState.java