this may cause conflict
Merge branch 'master' of https://github.com/jtresman/CSCI3308Lab3

Conflicts:
	README.md