Add .gitignore, remove .DS_Store
Merge branch 'master', remote-tracking branch 'origin' into tutorial