Added reset function
Merge remote-tracking branch 'origin/reset'

Conflicts:
	cannonball.pde
Fix post-merge runtime problems.
Fix more spacing style issues.