Afinando pregunta 1
Merge branch 'master' of https://github.com/claushellsing/monografia

Conflicts:
	application/views/elementos_informes/items/pregunta_tipo_1.php