Initial commit
Merge branch 'master' of github.com:gdevenyi/phd_thesis

Conflicts:
	.gitignore
	README.md