Imprimir en pantalla
Merge branch 'master' of github.com:D3f0/so2013

Conflicts:
	prueba.c