Done coding. Now to test. Inb4 ten million seg faults
Almost done again
Merge branch 'master' of https://github.com/stuydw/3d