small changes
small changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	JataakaTeamwork/games/SpaceGame/index.html