fixing routes
Organizes routes
Update routes.rb
Merge pull request #258 from yousraHazem/route_fix

fixing routes
fixing conflict with routes.rb