Modifique guia C++ prueba
Modifique la Guia 3.5 y 3.7
Merge branch 'diego' into dev
Merge branch 'ken' into dev