Add sign in and sign out links, and generate Devise views
resolve merge