Committed 0506 20:00
Merge branch 'master' of https://github.com/shreyask/phdthesis

Conflicts:
	README.md
Merge branch 'master' of https://github.com/shreyask/phdthesis