GIT Page Complete
Merge branch 'master' into gh-pages

Conflicts:
	Tiffin_boyd_project2/Gold/index.html