Punto B vdef
PuntoC def
Merge branch 'master' of https://github.com/igofrias/feriaSW

Conflicts:
	PropuestaTecnica/puntoB.txt
	PropuestaTecnica/puntoC.txt
Merge branch 'master' of https://github.com/igofrias/feriaSW
Merge branch 'master' of https://github.com/igofrias/feriaSW
Merge branch 'master' of https://github.com/igofrias/feriaSW
Requerimientos - Restricciones HW/SW