ejjkasdfoqefdfhkhjkasdhklashdfklahrdklqwr23uropefjkkdkdfoapd	plaeföfoapfkaklfjqofqo
fasdasd
Merge branch 'master' into bella

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
Merge branch 'master' into bella

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
sasegserg
asdasd
yigul
Merge branch 'Jessica'
f
Merge branch 'bella'
Git commit -a
Merge branch 'master' of https://github.com/Omnes/Spelprojekt

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

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
Merge branch 'sean'

Conflicts:
	Spelprojekt/AchievementState.cpp
	Spelprojekt/Resources/Data/Animalipedia/UnlockedFacts.xml
	Spelprojekt/Resources/Data/Settings.xml