Merge remote-tracking branch 'origin/master' into gh-pages
Meaningful Commit
Test Commit
bronze
Project 3
Changes
Project3
Merge remote-tracking branch 'refs/remotes/origin/gh-pages'

Conflicts:
	Project-2/Gold/index.html
	Project-2/Gold/js/main.js
	Project-3/Bronze/additem.html
	Project-3/Bronze/index.html
	Project-3/Bronze/js/main.js
	Project-3/Gold/css/style.css
	Project-3/Gold/index.html
	Project-3/Gold/js/main.js