Edit .gitignore
Merge branch 'master' of https://github.com/poupen/1451