Cambio
Nuevo echo
Merge branch 'testing'

Conflicts:
	Class2.php
ACtualizando proeycto
ACtualizando proeycto v0.2
send
Revert "edit .buildpath"

This reverts commit baa3499491ff72db91ea7f072bee38892e2dde95.

Conflicts:
	.buildpath
Revert "add config"

This reverts commit 5debe8a6328fa4c87187f084404abcac06417f41.

Conflicts:
	.project
	.settings/org.eclipse.php.debug.core.Debug_Process_Preferences.prefs
Prueba de nueva
send
limpiando ramificacion
elimnado archivo
eliminando .project
Merge branch 'testing' of https://github.com/lcorozco10/Github1 into testing

Conflicts:
	.project
	Class2.php