micommit
commit
Merge branch 'master' of https://github.com/julianaleon8/prolog

Conflicts:
	sopaDeLetras.pl
holis
ho
Merge branch 'master' of https://github.com/julianaleon8/prolog

Conflicts:
	sopaDeLetras.pl
Hola
Merge branch 'master' of https://github.com/julianaleon8/prolog

Conflicts:
	sopaDeLetras.pl
ho
Holis