y-Kollision korrigiert
Merge branch 'master' of https://github.com/BrackCurly/hackathon-game

Conflicts:
	public/.DS_Store
	public/Hackathon/.DS_Store