seja 1 correspondente
Merge branch 'master' of github.com:danielgatis/ac

Conflicts:
	app/models/user.rb
	config/routes.rb