minor change
Merge branch 'master' of github.com:debsankha/piecewise-smooth
ho hum
Merge branch 'master' of github.com:debsankha/piecewise-smooth

Conflicts:
	weekly reports/thesis/thesis.pdf
Merge branch 'master' of github.com:debsankha/piecewise-smooth
result of simulation