clean up a brit
Merge branch 'master' of https://github.com/bebensiganteng/simplephysics

Conflicts:
	src/collision.h
	src/demo.cpp
	src/integrator.h
	src/spring.cpp
	src/testApp.cpp
	src/verlet.cpp
	src/verlet.h