arreglando problema de gemlock
Merge branch 'master' of https://github.com/israelantezana/yosistemas

Conflicts:
	Gemfile.lock