routes fix
fixed conflicts
minor changes to routes and seeds
added Home link back to navbar
styling root and index pages
fixed merge conflicts
fixed merge conflicts