adds flash notices for logging out and logging in, adds sign in and out to nav bar
Merge branch 'master' into logout
clean up
fixed merge conflict