fawrtqeygaqe5y
Merge branch 'master' into bella

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
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
fda
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