Start using .gitignore
Merge branch 'origin/master'