Remove DS_Store
Merge branch 'master' into develop
Merge branch 'master' into develop
Remove erroneous files