Terminada creacion de la base CHR
Merge branch 'master' of github.com:cbcrg/compss-sandbox

I merge because I did a git push yesterday and it seems the changes were not included. Now I got to do it correctly, but couldn't push because I didn't have the last version modified.