Saved the planet, kinda :P
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1

Conflicts:
	Programmering/RobotSplit/RobotSplit/LevelLoader.cpp