Change .gitignore and delete others post
Merge remote-tracking branch 'origin'