Now imports a file of triangles called 'model.obj'
Ugh
Ugh, this is messy still but I need to stop
Uh... hm
Uh
rr
Well okay, fuck, I should go to bed
Eh
Merge remote-tracking branch 'tdengine/master' into alpha

Conflicts:
	src/c++/engine/draw.cc
Merge remote-tracking branch 'tdengine/master' into alpha

Conflicts:
	src/c++/engine/auxil.cc
	src/c++/engine/auxil.h
d
Merge branch 'alpha' of github:Advael/GUFG into alpha