5555
Merge bra222nch 'master' of https://github.com/avaquero/llibreria

Conflicts:
	usuaris/hash.py
2