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

Conflicts:
	Bamf/SynchronousGameLoop.cpp