added routes
Merge branch 'Sarah'
merging route changes
Fix conflicts on layout.erb