Merge branch 'master' of https://github.com/kwarner/kathleenportfolio into gh-pages
standbypage
standbypagetest
tryagainblah
aboutpage
addedcontact
blah
Merge branch 'gh-pages'