Added name and is_admin columns to users, started building future user models. Added rspec and pry-debugger
Fixed merge conflicts in models