Merge origin/master

Conflicts:
	src/simonsays/gameModel/Game.java
	src/simonsays/gameModel/Input.java