mostly working 3D, still testing residual bounce
Merge branch 'master' of github.com:ianvernon/cs111_hw_2