iyfi9
Merge branch 'Jessica'

Conflicts:
	Spelprojekt/WorldMapTutorial.cpp
Merge branch 'bella'