Adding back files that merging ate.
Merge branch 'gh-pages'

Conflicts:
	gold/css/style.css
Finished Gold, now on to bronze.
finished with project
Updating again.
Changed git hub link pages name
Finished videos, but now what do I do
Oops, missed one.
updating merged files