asdasdasd
kl
asdas
ull
sad
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
Merge branch 'robin'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
gffg
asdasd
asdasdasda
hej proggarpolare
uasduuasud
 pushMerge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
	Spelprojekt/Spelprojekt.vcxproj.filters
Hej alla proggare och fukking bella
iokopk