Update
Merge branch 'gh-pages' into task-ids

Conflicts:
	js/bundle.js
	js/index.js