begun work on the parseOBJ method and made a zip file including a obj file.
added material resource.
Merge branch 'master' into Demo

Conflicts:
	GameEngine/GameEngine/Source/main.cpp
	GameEngine/GameEngine/Test/hubba3.zip
removed orig files.