Update soap.csv
Update setup.csv
Merge pull request #29 from marcelasimao/patch-1

Update setup.csv - Bien. Adelante!
Update setup.csv
Merge pull request #27 from daniegarcia254/master

Update soap.csv - Ok!
Merge pull request #30 from Ivelate/patch-1

Update setup.csv - Ok!!
Update setup.csv
Merge pull request #31 from oscargonles/patch-1

Update setup.csv - Parece estar bien!
Laboratorio 0
rest.csv updated

añadidos links al rest.csv
Merge pull request #33 from charliemc/master

rest.csv updated - Aceptado!
Merge pull request #32 from andresju/master

Laboratorio 0 - Aceptado!
Setup.csv
Merge pull request #34 from Berbel92/master

Setup.csv - Aceptado!
Fix format
Update format
553939: REST server & Web Application
Merge pull request #35 from daniegarcia254/master

553939: REST server & Web Application - y para la próxima vez mira http://java.dzone.com/articles/new-java-7-feature-string , adiós a esos if infernales con cadenas :D
Merge remote-tracking branch 'upstream/master'
P1 started