riesgos
Merge branch 'master' of https://github.com/walterkato25/ing-software-2

Conflicts:
	PGP-TratamientoDeRiesgos-2014.doc
riesgos