Merge pull request #68 from sjmackenzie/master

added thesis
Update README.md
resolve conflict