TODO: check folder
Merge remote-tracking branch 'origin/master'

Conflicts:
	script.js
	style.css
update