agggggg
Merge branch 'sean'
asdasdasd
asdasasd
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
asdasdasd
Merge branch 'master' into robin

Conflicts:
	Spelprojekt/LevelManager.cpp
	Spelprojekt/Resources/Data/Level/Jungle_Level2.xml
	Spelprojekt/Resources/Data/Level/Jungle_Level3.xml