organize routes
Merge branch 'master' into kristen
Merge branch 'master' into kristen
Merge branch 'master' into kristen
Merge branch 'master' into kristen
Merge branch 'master' into kristen
resolve merge conflict
fix issue with sessions
tidy formatting
Merge branch 'master' into kristen