Merge pull request #1 from motain/master

Synch. upstream
Ignore DS_Store
New member adriendeotto
Merge pull request #13 from adriendeotto/feature/adriendeotto

Feature/adriendeotto