Categoria
Merge remote-tracking branch 'origin/categorias'

Conflicts:
	Bestnid/app/controllers/usuarios_controller.rb
	Bestnid/app/views/layouts/_header.html.erb
	Bestnid/app/views/usuarios/_form.html.erb
	Bestnid/app/views/usuarios/edit.html.erb
	Bestnid/app/views/usuarios/index.html.erb
	Bestnid/app/views/usuarios/new.html.erb
	Bestnid/app/views/usuarios/show.html.erb
	Bestnid/db/migrate/20141101185317_create_productos.rb
	Bestnid/db/schema.rb