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

Conflicts:
	Programmering/RobotSplit/RobotSplit/LevelLoader.cpp
raketskortimer
des. upd.
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1
spelbar och game-fix(joystick)
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1
småfix
fick göra en ny spelbar
Merge branch 'master' into Robbin

Conflicts:
	Programmering/RobotSplit/RobotSplit/Game.cpp