agfasgf
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
guiui
gfggfgf
Merge branch 'robin'

Conflicts:
	Spelprojekt/Spelprojekt.vcxproj.filters
	Spelprojekt/Taktikmeny.cpp
ioho
Merge branch 'Jessica'
adasdasdMerge branch 'robin'

Conflicts:
	Spelprojekt/Resources/Data/Abilities.xml
sdasa
ggfgf
Merge branch 'robin'
ggg
Merge branch 'bella'
hasjkdha
hefjkls
sg
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
asdasd
grggf
Merge branch 'Jessica'