Merge remote-tracking branch 'refs/remotes/origin/gh-pages' into Week2

Conflicts:
	dufrane_paul_week2/Gold App/additem.html
	dufrane_paul_week2/Gold App/css/style.css
	dufrane_paul_week2/Gold App/js/main.js
	img/Airplane.png
	img/Auto.png
	img/Boat.png
	img/Motorcycle.png
	img/delicon.png
	img/editicon.png
	index.html
	js/json.js