kgb
Merge branch 'master' of https://github.com/anxolois/anxo

Conflicts:
	texto.txt