Update readme.md
Merge branch 'master' of https://github.com/ben-tanen/Tufts

Conflicts:
	readme.md

Fixed ReadMe.md Merge Problem