Adding Assimp support
Merge branch 'master' of github.com:RealVirtImac/3DObs

Conflicts:
	src/Renderer.cpp