updet gamefunction n play
Merge branch 'master' of https://github.com/92hell/JumpingBoat

Conflicts:
	gamefunctions.lua