initial magento commit
Merge branch 'master' of github.com:jphire/magento