Edited README.md to have merge conflict
Merge branch 'master' of https://github.com/ameletyan/CSCI3308Lab3

Conflicts:
	README.md
Undo README.md changes to retry the merge
Merged README.md