Farmacia
Merge branch 'master' of https://github.com/dagss2014/dagss2014_gamma