add config
deleted DS_Store
Merge branch 'develop' into staging