Actualiza
Merge branch 'master' of github.com:pasosdeJesus/sivel2_sjr

Conflicts:
	Gemfile.lock