nothing to commit, aborted when trying to checkout to master
complete the merge
Merge pull request #34 from toannguyenle/angularjs

fix front page
nothing change - just accidentally open some file on master
delete delivery_test.rb
delete detail_test.rb
delete payment_test.rb
delete delivery_spec.rb
delete detail_spec.rb
delete payment_spec.rb
Merge pull request #29 from toannguyenle/natalia

nothing to commit, aborted when trying to checkout to master
wrote some tests on restaurant_spec.rb
change to completely rails version for development
Change migration: update order product table  with more field about price and product quantity
Merge pull request #36 from toannguyenle/purerails_toan

Purerails toan
Merge pull request #35 from toannguyenle/natalia

wrote some tests on restaurant_spec.rb
testing on restaurant
merge (?)
testing on order, not done yet
DRY testing on restaurant and product