Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	index.html
	script/script.js
	style/style.css