Detail View
Merge branch 'version1' of https://github.com/phylodex/repo into version1

Conflicts:
	.DS_Store
d