changes
Merge branch 'master' of https://github.com/pontikos/thesis
Merge branch 'master' of https://github.com/pontikos/thesis
Merge branch 'master' of https://github.com/pontikos/thesis
discussion rambling