Update site content 6-30-2014
Merge branch 'master' of https://github.com/marnel/marnel.github.io