asdasd
Merge branch 'robin'
jkbjl
hej
Merge branch 'Jessica'

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

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
	Spelprojekt/Resources/Menu/WorldMenu/Jungle1.png
	Spelprojekt/Resources/Menu/WorldMenu/Jungle2.png
	Spelprojekt/Resources/Menu/WorldMenu/seans/djungel.png
	Spelprojekt/Resources/Menu/WorldMenu/seans/djungel1.png
	Spelprojekt/Resources/Menu/WorldMenu/seans/djungel2.png
	Spelprojekt/Resources/Menu/WorldMenu/seans/night.png
	Spelprojekt/Resources/Menu/WorldMenu/seans/swamp.png
	Spelprojekt/Resources/Menu/WorldMenu/seans/worldmap.png
	Spelprojekt/Resources/Menu/WorldMenu/swamp1.png
	Spelprojekt/Resources/Menu/WorldMenu/worldmap.png
	Spelprojekt/Resources/Menu/WorldMenu/worldmap1.png
asdasd
asdasd
asdasd
asdasda
Merge branch 'master' of https://github.com/Omnes/Spelprojekt

Conflicts:
	Spelprojekt/OptionsMeny.cpp
	Spelprojekt/Resources/Data/Settings.xml
asdasdMerge branch 'sean'

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

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

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml