Cannon Code

Cameron added some CRUDE cannon code. Hoorah!
Merge remote-tracking branch 'origin/master' into ErikBranch

Conflicts:
	main.js