minor id change
Merge branch 'master' of https://github.com/andrenmelo/scissors

Conflicts:
	layout 2/index.html
Added widget.js
Merge branch 'master' of https://github.com/andrenmelo/scissors