#1022886 Sistema de usarios y permisos listo
Merge branch 'master' of https://github.com/ajvaleng/VisualizApp

Conflicts:
	app/models/user.rb
	db/seeds.rb