edited .gitignore
Merge branch 'master' of https://github.com/jgaraysumma/magento-store