Updated binary and semi-functional OBJ parsing.
Merge branch 'master' of github.com:theotherwhitemeat/coursework
Merging makefile changes