edit tutorial 1 sample.js
Merge branch 'master' of https://github.com/duncan60/tutorial

Conflicts:
	sample.js