Merge pull request #12 from henrikelopez/jose

Jose
Archivo de prueba
>>Myriam Trujillo
Archivo de prueba 2
>Myriam Trujillo
Merge pull request #13 from henrikelopez/myriam

Myriam
Merge pull request #14 from henrikelopez/henrike

Henrike
Actualice a "cosotas"
Merge pull request #15 from henrikelopez/myriam

Actualice a "cosotas"
Merge pull request #17 from henrikelopez/henrike

quite las "ssss"
-El comentario añadido
Merge pull request #18 from henrikelopez/israel

Asi es el comentario
-El nuevo comentario
Merge branch 'israel'
-Un comentario mas
Merge remote-tracking branch 'origin/master' into israel
Merge branch 'israel'
Modifique Hola
Merge remote-tracking branch 'origin/jose' into henrike
Merge remote-tracking branch 'origin/master' into henrike

Conflicts:
	cosita.php