Merging main.cpp
Merge branch 'master' of github.com:matthewhinkle/bamf
CollisionObjects now share their BamfObject's id.
Merging Xcode project
Merge branch 'master' of github.com:matthewhinkle/bamf