third
conflict
commit
Merge branch 'master' of https://github.com/checkers-labs/rails

Conflicts:
	app/models/user.rb
	app/views/users/new.html.erb