Pulldown from GitHub to Mac
Merge branch 'master' of https://github.com/LeeBaker3/MScDissertation

Conflicts:
	.gitignore