registro
Merge branch 'master' of https://github.com/nanomedia/latiosoft

Conflicts:
	qqq.txt
ratabnas