arreglo de una letra
arreglo de una letra
Merge branch 'master' of https://github.com/usabi/gfp

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/usabi/gfp
Merge branch 'master' of https://github.com/usabi/gfp
Merge branch 'master' of https://github.com/usabi/gfp
Merge branch 'master' of https://github.com/usabi/gfp
Merge branch 'master' of https://github.com/usabi/gfp
Merge branch 'master' of https://github.com/usabi/gfp
Merge branch 'master' of https://github.com/usabi/gfp

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/usabi/gfp
Inicializamos suma porque puede que algún porcentaje falte y no se realice algún paso del inject.