Users
Merge branch 'master' of https://github.com/joshchandler88/sample_app

Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb