library done
Merge branch 'master' of https://github.com/fcbaila/Hyperzine

Conflicts:
	lixo/contatos.xml