controllers, routes, authentication, oh my
fixed merge conflicts