test
Revert "test"

This reverts commit 12258fee5e1fa526d910ad8f064da558c4732757.
.DS_Store banished
Merge branch 'master' of https://github.com/switzersc/merge_app
conflict resolved