Updated README file to warn of merge conflict
Merge branch 'master' of https://github.com/kinnairdclan/testlab9-10-14

Conflicts:
	README