First Commit
Merge branch 'master' of https://github.com/kurthaeusler/Dissertation

* 'master' of https://github.com/kurthaeusler/Dissertation:
  Initial commit

Conflicts:
	.gitignore