Delete .gitignore
Merge origin/master