Git commit -a
Merge branch 'master' of https://github.com/Omnes/Spelprojekt

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

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
hej jag äger

asd
asdasdas
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
Merge branch 'sean'

Conflicts:
	Spelprojekt/AchievementState.cpp
	Spelprojekt/Resources/Data/Animalipedia/UnlockedFacts.xml
	Spelprojekt/Resources/Data/Settings.xml
hej
Merge branch 'bella'
mmmm sexxxy
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
Merge branch 'robin'
hej jag heter sean. rasmus <3
Merge branch 'sean'
lölölö
Merge branch 'master' into robin
asdfsdg
Merge branch 'master' into bella

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml