working on views/users/new and edit
update to app/views/orders/show.html.erb
Merge branch 'master' into anotherBranch
fix merge conflict
Merge pull request #52 from toannguyenle/anotherBranch

working on views/users/new and edit
updatecd app/views/orders/index.html.erb
Merge pull request #53 from toannguyenle/rails_toan

update order page with multiple products and description for a single or...
fixing the order -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
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
fix the business sign up view
updated app/views/restaurants/*.html.erb
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
Merge pull request #59 from toannguyenle/branch3

fix the business sign up view