jo
Merge branch 'master' of https://github.com/Vulkanmannen/Blodpalt_Studios_Project_2

Conflicts:
	BlodPaltProjekt2/BlodPaltProjekt2.vcxproj