Not finished yet, but commiting so I can see if Marty's push worked
Merge branch 'master' of github.com:mloewent/TriCollide