Lagt in rätt banlogik
Merge branch 'peterH' of https://github.com/Pallevante/Iris into peterH

Conflicts:
	Iris/Level.cpp