working on the fixes
Merge branch 'master' of https://github.com/gamer145/KB01

Conflicts:
	Engine KB-01/Engine KB-01/Resource_Manager.h