Rolando agora.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
Início do onde parei
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/home_controller.rb
	app/views/commontator/comments/_votes.html.erb
Início do onde parei