updated for github.io
Merge branch 'master' of https://github.com/srohrer32/website