Committing user model to janice local branch
Commit user schema
Committing user model to janice branch...fleshed out and ready to role.
Merge remote-tracking branch 'origin/master' into janice

Conflicts:
	.idea/blog_engine.iml
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/users/new.html.erb
	config/routes.rb
	db/schema.rb
	test/controllers/users_controller_test.rb
	test/fixtures/users.yml
Merge with user functions
merged changes from main into janice branch
Still merging
updating notes on work done
Work Summary update
Corrected user routes
Merge remote-tracking branch 'origin/janice' into janice

Conflicts:
	config/routes.rb