edit homepage
Merge branch 'master' of https://github.com/jthurst3/CSUG

pull content from github