modify .gitignore to ignore .DS_Store file
Merge branch 'master' into struct