...
Merge branch 'master' of https://github.com/RobertCalbul/_Recursos_Humanos_Codigo_Barra_

Conflicts:
	proyecto codigo barra/index/index.suo