Score is displayed and travel points added as we swim.
Merge branch 'master' into score

Conflicts:
	src/no/ntnu/flapmyfish/screens/GameScreen.java