update
Merge branch 'master' of https://github.com/ricard-sole/NARWALS

Conflicts:
	README.md
extensiones