galoget/github-workshop — pull request #31 by Andreu-95 (2014-08-23 15:35:52+00:00)
Title: Prueba conflicto

Cambio en la linea 812