Making a conflict part b
Merge branch 'master' of https://github.com/MurdoNZ/Test

Conflicts:
	Docuement To Conflict.txt