Delete random semi-colon in view
Fix conflict in views/cart/show/
Merge branch 'master' of github.com:BobGu/dinner_dash
Merge branch 'master' of github.com:BobGu/dinner_dash
Merge branch 'master' of github.com:BobGu/dinner_dash
Merge branch 'master' of github.com:BobGu/dinner_dash
Remove all RED and PENDING specs. Total GREEN test count is 53.
Merge branch 'master' of github.com:BobGu/dinner_dash
Merge branch 'spec-cleanup-initial'