user login, logout, & signup
fixed merge conflict in gemfile