initial commit
Merge https://github.com/igorwulff/magento