new push - fixed author
Merge branch 'master' of dan-miller.github.com:/dan-miller/thesis