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

This merge is neccessary!
Started working on demo scene.
Committing art.
Committing Xcode project