meh
Merge branch 'master' of https://github.com/Webfox93/3DEngine

Conflicts:
	3DEngine/Code/Kernel.cpp