Revert "Cambio 2.3"

This reverts commit 8afbc729d2c629dfcaeb10eddf5486dc66578f76.
Delete PGP-2014.doc
Delete cookbook.SQL
Merge remote-tracking branch 'origin/Rama_Nico'

Conflicts:
	codigo/img/libro_predeterminado.png
	fotos/libro_predeterminado.png
	img/libro_predeterminado.png
Merge branch 'master' of https://github.com/nicohe/ingenieria2Grupo19
Eliminar
Borrado
borrado 2