Merge origin/master

Conflicts:
	nbproject/project.properties
	public_html/Wk3/Demo/week3.html
	public_html/Wk3/Lab/index.html
	public_html/Wk3/Lab/scripts.js
	public_html/Wk3/Lab/style.css