merging
Merge branch 'master' of https://github.com/matthewhinkle/bamf
added physics