dsstore
Merge branch 'master' of https://github.com/phylodex/phylo

Conflicts:
	.DS_Store
remove dsstore