F�rsta prototyp, 13:44
Merge branch 'master' into Dev
13:52

Conflicts:
	RobotSplit/RobotSplit/Main.cpp
Window klass
14:39
...
Window klass fix 1
15:15
15:21
15:34
16:47
17:15
17:54
Merge branch 'master' into Dev

Conflicts:
	RobotSplit/RobotSplit/Main.cpp
?
10:17
10:56
window done
13:09 testsave fail
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1
Fixed
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1
Merge branch 'master' into Dev

Conflicts:
	RobotSplit/RobotSplit/Main.cpp
	RobotSplit/RobotSplit/RobotSplit.vcxproj.filters
	RobotSplit/RobotSplit/TestSave.xml