added magento
Merge branch 'master' of https://github.com/n8b/Magento