Score is no longer incremented over time
Merge branch 'master' of https://github.com/mb1069/ini-hou.git

Conflicts:
	src/main/java/seprini/controllers/MultiplayerController.java