resolving conflicts in routes.rb
Resolving conflicts routes.rb
Merge pull request #4 from Axelena/order_selection

Order selection
Merge pull request #5 from Axelena/master

resolving conflict in this file
Order selection and Order Display