txt 100% funcional
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	TypeRecord/test.php