Causing a merge conflict
Adding readme file to be updated by partner
Merge branch 'master' of https://github.com/cala9649/SchoolStuff

Conflicts:
	README.md