se corrige algunos errores
Merge branch 'master' of https://github.com/morenodaryl/Bisne
Corrigiendo el merge
Merge branch 'master' of https://github.com/morenodaryl/Bisne

Conflicts:
	Gemfile