updated app/views/orders/index.html.erb
update merge conflict w steve branch
Merge pull request #65 from toannguyenle/steve_monday

updated app/views/orders/index.html.erb
update api endpoint
Merge pull request #66 from toannguyenle/rails_toan

update api endpoint
Merge pull request #67 from toannguyenle/branch3

working on home styling
updating yelp api
update
Merge branch 'master' into rails_toan
Merge pull request #68 from toannguyenle/rails_toan

updating yelp api
Merge branch 'master' into branch3
working on home styling