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

Conflicts:
	.DS_Store

Phylodex.xcodeproj/project.xcworkspace/xcuserdata/Freeman.xcuserdatad/Us
erInterfaceState.xcuserstate
	Phylodex/.DS_Store
Cannot load Evolutionary tree at once
merge sync with master
fixing conflicts
minor tweak fixes