Create merge conflict
Merge branch 'master' of https://github.com/nicot/CSCI3308lab3

Conflicts:
	README
Merge branch 'master' of https://github.com/nicot/CSCI3308lab3