buggfix inte klar
Merge branch 'master' into Robbin
foo
Merge branch 'master' into Robbin
buggfix (inte klar)
destruktor (inte klar)
Merge branch 'master' into Robbin

Conflicts:
	RobotSplit/RobotSplit/Game.cpp
crashfix dialogbox + unitmanager har hand om delete av units
crashfix dialogrutor
Merge branch 'Robbin' of https://github.com/Dahlqvist/Spelprojekt1 into Robbin
Merge branch 'master' into Robbin
ppt testning