rails app generated
Merge branch 'master' of github.com:azclick/spree_app