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