cutyu
ggf
Merge branch 'Jessica'
Merge branch 'master' of https://github.com/Omnes/Spelprojekt

Conflicts:
	Spelprojekt/SoundManager.h
jjkk
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
Merge branch 'master' into bella