Rasmus, meanix
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1

Conflicts:
	RobotSplit/RobotSplit/Game.cpp
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1

Conflicts:
	RobotSplit/RobotSplit/TextureManager.cpp
Braiaaainz