Edited README.md to instigate conflict
Merge branch 'readmeEdits'

Attempted to resolve merge conflict.

Conflicts:
	README.md
Merge remote-tracking branch 'school/master'