dd
Merge branch 'freedraw' of https://github.com/tjb1015/CPSC427FinalProject into freedraw

Conflicts:
	js/magic.js