commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/index.html
	web/js/app.js