Primer commit tiempos
Merge branch 'master' of https://github.com/pdbenitez/g4-tadp-1c2014-como-viajo
Merge branch 'master' of https://github.com/pdbenitez/g4-tadp-1c2014-como-viajo