score is complete
y
added javadoc
Merge branch 'master' into game-logic

Conflicts:
	src/game/FroggrGame.java