Fixed small merge errors
Added Model class
Made Object3D class more extensible
Added ObjLoader for loading Wavefront Object files
Removed PlyLoader class, as Obj will be used instead.