Adiciona localização
Tela de edição
Remoção de usuário
Scaffold de artigos
Articles de novo
Merge branch 'master' of ssh://github.com/dmarquezbh/first_app_2014
Remover articles
Cria scopes
Edição e remoção de contas
Arquivo apagado
Autenticação por devise
Correção no ambiente de teste
Testes na action index do controller users
Modal para criação de contas a partir da tela de usuários
Aula extra polimorfismo
arquivo excluído
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile
	app/assets/stylesheets/custom.css
	app/controllers/application_controller.rb
	app/controllers/concerns/bills_controller.rb
	app/controllers/concerns/users_controller.rb
	app/controllers/concerns/welcome_controller.rb
	app/helpers/application_helper.rb
	app/helpers/users_helper.rb
	app/models/bill.rb
	app/models/user.rb
	app/views/bills/_bill.html.erb
	app/views/bills/_form.html.erb
	app/views/bills/_form_modal.html.erb
	app/views/bills/_index.html.erb
	app/views/bills/_modal.html.erb
	app/views/bills/create.js.erb
	app/views/bills/create_bill.js.erb
	app/views/bills/destroy.js.erb
	app/views/bills/edit.js.erb
	app/views/bills/new_bill.js.erb
	app/views/bills/update.js.erb
	app/views/devise/registrations/new.html.erb
	app/views/layouts/application.html.erb
	app/views/shared/_error_messages.html.erb
	app/views/shared/_navbar.html.erb
	app/views/users/_form.html.erb
	app/views/users/edit.html.erb
	app/views/users/index.html.erb
	app/views/users/show.html.erb
	config/application.rb
	config/environments/development.rb
	config/initializers/devise.rb
	config/locales/devise.en.yml
	config/locales/devise.pt.yml
	config/locales/pt.yml
	config/routes.rb
	db/schema.rb
	spec/features/welcome/index.html.erb_spec.rb
	spec/models/user_spec.rb
	spec/spec_helper.rb
	spec/support/devise.rb
	spec/support/js_features.rb
	spec/support/shared_connection.rb
alterando Gemfile