este es un commit hecho por Chucho
Merge branch 'master' of https://github.com/GangstaParadise/ping

Conflicts:
	README.md
Merge branch 'master' of https://github.com/GangstaParadise/ping