Updates resume after Summer 2014
Merge branch 'master' of ssh://bitbucket.org/jveldridge/website