Merging Xcode project
Merge branch 'master' of github.com:matthewhinkle/bamf

Merging the Xcode project
Updated collision handling a bit to make pieces not move.