Changed readme to cause conflict
Merge branch 'master' of github.com:sarjun/cs3240lab5

Conflicts:
	README.md
Forgot to commit helper file