Merge branch 'master' of https://github.com/mic25/BMMP_Gruppe_1

Conflicts:
	Goblin Race/game.js
endless2