feroz är kass
Merge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
jkbjk
uohu
Merge branch 'Jessica'
best merge ever

Conflicts:
	Spelprojekt/Resources/Data/Animalipedia/UnlockedFacts.xml
	Spelprojekt/Resources/Data/Settings.xml
hej jag är här nu. ha en bra dag polare
Merge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
MERGE CONFLICK INCOMMING
Merge branch 'master' of https://github.com/Omnes/Spelprojekt

Conflicts:
	Spelprojekt/LevelTutorial.cpp
	Spelprojekt/Resources/Data/Animalipedia/UnlockedFacts.xml
noobds

haj
Merge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Animalipedia/UnlockedFacts.xml
asdasd
Merge branch 'robin'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
Merge branch 'bella'