finished bulk of code; needs fine-tuning
Merge branch 'master' of https://github.com/stuydw/3d