Shit dies and doesn't kill you
Merge branch 'Fungerande'

Conflicts:
	Fallen Stars/Entity.h
Merge branch 'origin/master'