Anadi principio de 3.2
Elimine archivos no pertenecientes a mi branch
Anadi 3.2 a la Guia
Merge branch 'diego' of https://github.com/degva/GKD-client-side into diego
Merge branch 'ken' into dev

Conflicts:
	testing-gtk/guia/GuiaC++