RecordFile Pro
no se que pasa
Merge branch 'master' of https://github.com/MatamorosF3/RecordsFiles.git

Conflicts:
	RecordsFiles.pro.user
update
Merge branch 'master' of https://github.com/MatamorosF3/RecordsFiles

Conflicts:
	RecordsFiles.pro.user
update
update
Merge branch 'master' of https://github.com/MatamorosF3/RecordsFiles

Conflicts:
	RecordsFiles.pro.user
	main.cpp