Merge branch 'master' of ssh://einstein/~/public_html/code/git/drexel-thesis