README and Copyright Notice
Merge branch 'master' of https://github.com/drnn1076/diss.git into proof-read

Conflicts:
	README.md