Editing for conflict
Merge branch 'master' of https://github.com/foucher/cs3-homework1

Conflicts:
	README