Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	html/index.html
Merge remote-tracking branch 'origin/master'