line added not functional

added lines, not functional
Merge remote-tracking branch 'origin/master'

Conflicts:
	FishGame.gmx/FishGame.project.gmx
	FishGame.gmx/scripts/scr_setGlobals.gml