update to app/views/orders/show.html.erb
updatecd app/views/orders/index.html.erb
Merge pull request #54 from toannguyenle/branch3

fixing the order -index.html.erb
changed icons in app/assets/templates/ products.html.erb
resolving merge to master
order product details
Merge pull request #55 from toannguyenle/rails_toan

order product details
Merge pull request #56 from toannguyenle/steve_monday

Steve monday
Updated app/views/restaurants/new.html.erb
updated app/views/restaurants/*.html.erb
update order confirmation page
Merge pull request #57 from toannguyenle/rails_toan

update order confirmation page
Merge pull request #58 from toannguyenle/steve_monday

Steve monday
solve merge conflict