Prueba de edición

Prueba de edición
test

test
Merge pull request #3 from sansr/master

Include AragoDBPedia dataset
Fixed the description from Sandra Saez to keep it in one line
added Dataset
Merge branch 'master' of https://github.com/n-lopez/Curso2014-2015 into n-lopez-master

Conflicts:
	Assignment1/DatasetDescriptions.csv
Merge branch 'n-lopez-master'
Merge remote-tracking branch 'upstream/master'
Include DBpedia ES
Include Didactalia dataset
Merge pull request #5 from etsiinf/master

New datasets
Added San Francisco DataSet
Merge pull request #6 from alejandrofcarrera/master

Added San Francisco DataSet
Added AEMET
Merge pull request #7 from baraalex/patch-1

Added AEMET
Update CSV Format
Merge pull request #8 from alejandrofcarrera/master

Update CSV Format to GitHub viewer, although GitHub viewer requires CSVs with , as a separator, what makes it not directly usable for the type of information that we are collecting
Include Datos abiertos Zaragoza
Revert "Include Datos abiertos Zaragoza"

This reverts commit b5b5dbd27e7647bb8ac903070e86b20e66cbbfb3.
Merge remote-tracking branch 'upstream/master'