Gemfile
Merge branch 'master' of https://github.com/tebayoso/ReDePerros
Merge branch 'master' of https://github.com/tebayoso/ReDePerros
Merge branch 'master' of https://github.com/tebayoso/ReDePerros
Merge branch 'master' of https://github.com/tebayoso/ReDePerros

Conflicts:
	Gemfile
Fixed gemfile