test
Removed junk file.
Updating user.rb to validate name length and duplicates
Updated user.rb
Merge commit '7bc175dee02787568149f9f2d8d727bd74d55003'

Conflicts:
	app/models/user.rb
Adding Controller files and testing files
I am creating a branch with my current progress because I'm having errors after trying to use Factory Girls
Current successful version of app - On the refactor error messages step
At farthest working version. Next: refactoring submission form labels
At current working version - Refactor User Form Submission
Merge commit '3258a75cb0d4afbf384806f3a91cc86858f834a4'

Conflicts:
	app/controllers/users_controller.rb
	app/views/layouts/application.html.erb
	app/views/users/index.html.erb
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	spec/factories.rb
	spec/features/user_pages_spec.rb
	spec/support/alerts.rb
At current wrking vrsion - Refractor form submission button label
At curent working version - New Resource for logging in users
At current working version - New resource for logging in users.
At current working version - 09/26/14
At current working version - About to start Passing Tests for Logged in Users
Merge commit 'ef60c24e0794212e4c4adff421f0c59dcc26805b' into fixMerge
At current working version - New resources for logging in users.
Merge commit 'acd38e40bdcbe76945ee9d7e7abb22b973d3ef24' into fixMerge

Conflicts:
	app/controllers/users_controller.rb
At current working version - Welcome to Bootstrap