Added dist directory to package.json
Merge branch 'master' into dev

Conflicts:
	dist/script.js
	package.json