Inicio
okey
Merge https://github.com/manuelblanch/codeigniter_sintesi

Conflicts:
	.gitignore