Bugs Fixed Cogs
Cogs + collision
Merge branch 'master' of https://github.com/denthler/Grupp5LitetSpelprojekt

Conflicts:
	SteamPunk_Platform/Application.cpp
	SteamPunk_Platform/Main.cpp
	SteamPunk_Platform/StemPunk.vcxproj.filters
	SteamPunk_Platform/World.cpp
	SteamPunk_Platform/shader.fx
Merge branch 'master' of https://github.com/denthler/Grupp5LitetSpelprojekt