Add a Bitdeli badge to README
Merge pull request #4 from bitdeli-chef/master

Add a Bitdeli Badge to README
merge conflict
fixed order assignment
cart controller fix to be inline with the hariki advisory #19
admin order controller #19
admin  carts controller #19
Merge pull request #20 from webhat/feature/hakiri

Should fixed #19
gitignore update [skip ci]
merge conflicts
fixed logging bug