asdasda
asdasdas
afgasg
Merge branch 'sean'
asdasd
Merge branch 'master' of https://github.com/Omnes/Spelprojekt

Conflicts:
	Spelprojekt/Resources/Data/Level/Jungle_Level2.xml
	Spelprojekt/Resources/Data/Level/Jungle_Level3.xml
asdasdasda
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
asd
Merge branch 'robin'
asdasd
asdasdasd
erhwerb
Merge branch 'sean'

Conflicts:
	Spelprojekt/Taktikmeny.cpp
asfq
asdadasd
Merge branch 'robin'

Conflicts:
	Spelprojekt/Taktikmeny.cpp
asfasf
adgfbr
Merge branch 'sean'