updated marc's website
Merge branch 'gh-pages' of https://github.com/wdi2/students into gh-pages