Can take c and k for overdamped equation
Merge branch 'master' of github.com:parkerh/springcam

Conflicts:
	res/js/main.js