merged

Conflicts:
	canvas.js
merging?