Tried to edit links yet again

Links edit see if it works
Merge branch 'gh-pages' of https://github.com/TylerTsang/The-Art-Workshop into gh-pages

Conflicts:
	3D.html
Merge branch 'gh-pages' of https://github.com/TylerTsang/The-Art-Workshop into gh-pages