break rule #1: yes
Merge branch 'master' of github.com:saucecode/threed-cpp