Mi primer commit
linea añadida commit2
fichero readme feature1
FEATURE2
modificado feat1
Merge branch 'feature2'
comit no se cual
Merge branch 'master' of https://github.com/ECCI-IS-2014/GOC

Conflicts:
	README.txt