changing the MD file
Merge branch 'master' of https://github.com/TSteele27/CMP150

Conflicts:
	README.md