name main
Merge branch 'master' of https://github.com/dcdanko/CompBioProject

Conflicts:
	src/upgma.py