pull request
merge style changes
fixes merge conflicts
Sets up route redirects on incorrect user login