fixing routes
Revert my error
Organizes routes
Revert "Revert my error"

This reverts commit 674e62b61abd6fc30dd4fcb1742c4e415ac87a89.
Update routes.rb
Merge pull request #258 from yousraHazem/route_fix

fixing routes
fixing conflict with routes.rb