cambios del viernes en la mañana

saiuhdiasuda{sfn
Merge branch 'master' of https://github.com/jofeew/CRJR_703

Conflicts:
	CRJR_703.suo
	CRJR_703/bin/Debug/CRJR_703.exe
	CRJR_703/bin/Debug/CRJR_703.pdb
	CRJR_703/obj/x86/Debug/CRJR_703.exe
	CRJR_703/obj/x86/Debug/CRJR_703.pdb