Added Merge Conflict Message to README
Merge branch 'master' of https://github.com/edcr7526/lab3

Conflicts:
	README.txt