Comente todas mis funciones.
Merge branch 'master' of https://github.com/sofiabravo103/jon_es_gay_sofia_tambien

Conflicts:
	pokesim.hs