Merge origin/master

Conflicts:
	public_html/Week2/demo/index.html
	public_html/Week2/demo/script.js