Added ignore DS_Store
Merge branch 'master' of https://github.com/phylodex/phylo

Conflicts:

Phylodex.xcodeproj/project.xcworkspace/xcuserdata/parkapal.xcuserdatad/U
serInterfaceState.xcuserstate