Lab0 - Adrian Gañan
Merge pull request #11 from adriangp/master

Lab0 - Adrian Gañan
Merge branch 'master' of https://github.com/charliemc/WebEng2014

Conflicts:
	labs/setup.csv
Update setup.csv
Merge pull request #13 from jgbarcos/patch-1

Update setup.csv - Muy bien hecho.
Deleting .settings
Modified soap.csv
Modified README.md
Merge pull request #14 from javiertello/master

Added my projects URLs & Mistake correction - Bien hecho!
Update readme
Add rest
Merge branch 'master' of
https://github.com/UNIZAR-30246-WebEngineering/WebEng2014.git
Update README.md
Update README.md
Update setup.csv
Update setup.csv
Update setup.csv
Merge pull request #18 from gBarrerasSanz/patch-1

Update setup.csv - Aceptado
Merge branch 'jorgeizquierdo-patch-2'
Merge branch 'master' of
https://github.com/UNIZAR-30246-WebEngineering/WebEng2014.git

Conflicts:
	labs/setup.csv