First commit
Merge branch 'master' of https://github.com/davecormier/thesis

fun times