some things
Merge branch 'rerouting-routes' of github.com:coreyd303/the_pivot into rerouting-routes