set-up migration and model for users
ran migration for users
updating skeleton for users
fix merge conflict in config/routes.rb