was working on views for deliveries
nothing to commit
Merge pull request #25 from toannguyenle/rails

80% done with CRUD - still working on some kinks with order
Merge pull request #26 from toannguyenle/rails

80% done with CRUD - still working on some kinks with order
Merge pull request #27 from toannguyenle/natalia

Natalia
fix merge conflict