me tiro error
Merge branch 'master' of http://www.github.com/corperk/jnontetravex

Conflicts:
	registro.txt

conflictos y error D:!