lol
Merge branch 'master' of https://github.com/padsof-uam/padsof

Conflicts:
	rime.txt
peneee
proyecto eclipse
padsof pene caballo
Merge branch 'master' of github.com:padsof-uam/padsof