Lagt tillbaka sound och music getInstance() i main
16:37
16:50
Merge branch 'master' into Dev

Conflicts:
	RobotSplit/RobotSplit/Sound.cpp