batch fixing However gramatic mistake
Merge branch 'master' into cor2

Conflicts:
	thesis.pdf
Merge branch 'cor2'