primer commit
modificamos readme
añadimos fichero feature
añadido readme.feature2
modificado readme.feature1
Merge branch 'feature2'
modificado readme.feature2
Revert "modificado readme.feature2"

This reverts commit 68bc6b87924af79646019529f37a1db525463d35.
asdasd
Merge branch 'master' of https://github.com/ECCI-IS-2014/GOA into test1