test
Merge branch 'master' of https://github.com/denthler/Grupp5LitetSpelprojekt

Conflicts:
	SteamPunk_Platform/PlatformManager.cpp
	SteamPunk_Platform/PlatformManager.h
	SteamPunk_Platform/StemPunk.vcxproj.filters