snapshot
Merge pull request #3 from chris-held/master

snapshot
Delete .DS_Store
Delete .DS_Store
Delete .DS_Store
merging
Merge branch 'master' into testing
cleanup