idk
gerge branch 'master' of https://github.com/matthewhinkle/bamf
merge conflicts
Conflicts:
	Bamf/PhysicsWorld.cpp
	Bamf/PhysicsWorld.h
	Bamf/main.cpp