add merge conflict message
Merge branch 'master' of https://github.com/Werling44/CSCI3308-Lab3

Conflicts:
	README.txt