reverting gitignore
Merge origin/master