Ish working.
Merge remote-tracking branch 'origin/Demo' into resource_manager_with_allocator
The Resource manager is now using the LinearAllocator to allocate resources. It even works with shared_ptr.
Merge remote-tracking branch 'origin/Demo' into resource_manager_with_allocator
Trying to clean up some memory leaks.
Moving
gitignore
gitignore
fuck you  c++
Logger has moved to it's own name space in the ToolKit.lib.
Reverted to old memory usage.
Merge branch 'master' into resource_manager_with_allocator

Conflicts:
	.gitignore
	GameEngine/ToolKit/ToolKit.vcxproj
	GameEngine/ToolKit/ToolKit.vcxproj.filters
Merge now compiles. Still a memory leak to clean up.
Memory leak is now gone.
Merge remote-tracking branch 'origin/master' into resource_manager_with_allocator