Update rest.csv
Update setup.csv
Update soap.csv
Update soap.csv
Update rest.csv
Update events.csv
Merge pull request #61 from jorgeizquierdo/patch-4

Update rest.csv - Aceptado
Merge pull request #62 from jorgeizquierdo/patch-5

Update setup.csv - Aceptado
Merge pull request #63 from jorgeizquierdo/patch-6

Update soap.csv - Aceptado.
Merge pull request #67 from jorgeizquierdo/patch-7

Update events.csv - Aceptado
Merge pull request #67 from jorgeizquierdo/patch-7

Update events.csv - Aceptado
Merge branch 'master' of https://github.com/UNIZAR-30246-WebEngineering/WebEng2014.git
Merged
Merged
Merge branch 'master' of https://github.com/UNIZAR-30246-WebEngineering/WebEng2014.git
Merge branch 'patch-3' of https://github.com/pablooli/WebEng2014

Conflicts:
	labs/soap.csv
Merge branch 'patch-4' of https://github.com/pablooli/WebEng2014 into
pablooli-patch-4

Conflicts:
	labs/rest.csv
changes
Merges
Merges