link updates
Merge branch 'master' of https://github.com/danielravina/comp_1950_project

Conflicts:
	proto_site/sitemap.shtml