Desde el repo Original
Merge branch 'master' of https://github.com/dgsosa/Probando_RaphaelJs

Conflicts:
	test.txt   Arreglados