Merge branch 'master' of https://github.com/tyrus1235/criduino

Conflicts:
	.irbc
	app/controllers/application_controller.rb
	app/controllers/confirmations_controller.rb
	app/controllers/user_sessions_controller.rb
	app/controllers/users_controller.rb
	app/mailers/signup_mailer.rb
	app/models/user.rb
	app/models/user_session.rb
	app/views/layouts/application.html.erb
	app/views/signup_mailer/confirm_email.html.erb
	app/views/signup_mailer/confirm_email.text.erb
	config/environments/development.rb
	config/locales/pt-BR.yml
	config/routes.rb
	db/schema.rb

Implementação final da base do site.