vamossss
nmjMerge branch 'master' of https://github.com/avaquero/llibreria