ignore .DS_Store
Merge branch 'dev_log'