ADD multiplicación desde eclipse
Merge branch 'master' of https://github.com/dscdavid/practica1.git

Conflicts:
	index.php