Implemented  top and bottom collision border
Merge branch 'master' into score

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