fawrtqeygaqe5y
Merge branch 'master' into bella

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
hej här finns pankakor till alla
Merge branch 'sean'
git commit fisk
Merge branch 'master' into robin
asdasd
hej här kommer alla fina superpaket
Merge branch 'sean'
hej, Sean (I know what you did...) NOOB!!!!!!!!!!!!
Merge branch 'bella'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml