added unicorn
Merge branch 'master' of github.com:shoponrails/shop_on_rails_demo