Merge branch 'master' of https://github.com/mrblasco/stableRoomateMatching

Conflicts:
	README.md
conflict read me
trying to do readme
readme 2