temp files from mac
Merge branch 'master' of https://github.com/hxnx-sam/DiscreteSpatialPhyloSimulator

Conflicts:
	src/.DS_Store