Merge pull request #1 from thecristen/gh-pages

Update
Merge branch 'master' of github.com:thecristen/thewebsite2013 into gh-pages

,