took out binding.pry
finish merge
remove login_require helper method declaration
user login works, on to password