foo
att göra
Merge branch 'master' into Robbin

Conflicts:
	RobotSplit/RobotSplit/XmlSaver.cpp
Merge branch 'master' into Robbin
Byt bilder tut2
Merge branch 'master' into Robbin

Conflicts:
	RobotSplit/RobotSplit/Game.cpp
Tutorial 2 klar
Merge branch 'master' into Robbin
tagit bort storlek
Merge branch 'master' into Robbin
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1