Anthony's changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	BouncingCube/BouncingCube.vcxproj
	BouncingCube/BouncingCube.vcxproj.filters
Anthony's true changes
impulse and shit
Merge pull request #3 from smoore2171/master

impulse and face