removal of old
remove straggler
removing ds_store
Merge branch 'develop'
Merge branch 'master' into develop
update