test
Merge branch 'master' of github.com:Lannyland/Dissertation

Conflicts:
	Dissertation/tex/LannyDissertation.aux
Merge branch 'master' of github.com:Lannyland/Dissertation
Merge branch 'master' of github.com:Lannyland/Dissertation
Merge branch 'master' of github.com:Lannyland/Dissertation
Merge branch 'master' of github.com:Lannyland/Dissertation
Updated form