Hello aqui estoy.
Merge branch 'master' of github.com:Anaxagorax/El-Durako

Conflicts:
	eric.php