Update gitignore
Merge branch 'master' of github.com:ducthang310/magento18