remove gitignore locally to allow merge from remote
Merge remote-tracking branch 'origin/master'