Merge branch 'master' of github.com:sbknk/magento-intro