try again
Merge branch 'master' of https://github.com/cortle/cornellstartuplist

Conflicts:
	requirements.txt