asdasd
Merge branch 'robin'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
fadf
Merge branch 'bella'
fdsfaf
sfad
credits cutscene
jkfhdlgsdf
Merge branch 'robin'

Conflicts:
	Spelprojekt/Resources/Data/Animalipedia/UnlockedFacts.xml
Vi har inga kakor kvar, bellbella. varför har skorpionen gasmask ?
namnkonvention
Merge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Animalipedia/UnlockedFacts.xml