first commit
Merge https://github.com/tenmillion/thesis