Merge commit '46328fa59530f0eb45ed80e2d3dae69a8497ef4f' into gh-pages

Conflicts:
	Project one/index.html
fixing merging conflicts