finalizado ejercicio
Merge branch 'master' of https://github.com/gdelacruz/progfun

Conflicts:
	progfun-streams/src/main/scala/streams/GameDef.scala
	progfun-streams/src/main/scala/streams/StringParserTerrain.scala