hej jag har stora paket med glass. vi ska fira. PEKARE!
Merge branch 'sean'
fffffffffffff
Merge branch 'master' of https://github.com/Omnes/Spelprojekt

Conflicts:
	Spelprojekt/FactButton.cpp
	Spelprojekt/Resources/Data/Animalipedia/UnlockedFacts.xml
	Spelprojekt/Resources/Data/FactUnlock.xml
hajaja
Merge branch 'sean'

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

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml