Merge branch 'master' of ssh://cislinux.cis.ksu.edu/~/public_html/repos/macts

Conflicts:
	website/index.html
fixed up some HTML problems