Epale que mas
Merge branch 'master' of github.com:josepas/pascal

Conflicts:
	hola