Se realizan modifcaciones al SRS
Merge branch 'master' of https://github.com/gaudisolutions/ecos

Conflicts:
	Conceptos Avanzados Ingenieria Software/TSP/Ciclo I/SRS/SRS.doc
Merge branch 'master' of https://github.com/gaudisolutions/ecos
Merge branch 'master' of https://github.com/gaudisolutions/ecos
Se subme documento de diseño de algo nivel