First commit
Merge branch 'master' of github.com:marius-miron/magazin.magento