Trying to make javascript love the canvas
Merge branch 'master' of https://github.com/eggertj12/DivineDraw

Conflicts:
	js/classes.js
	js/scripts.js