Adicionando ações na tabela
Merge branch 'master' of github.com:luizfilho/backrails

Conflicts:
	app/controllers/cards_controller.rb
	app/views/cards/index.html.erb