Initial commit of working files.
Merge branch 'master' of https://www.github.com/5x5x5x5/thesis