Merge branch 'workshop_fixes'

Conflicts:
	.gitignore
	package.json