fin del dia
todo
logros *
logros
ignores
Merge branch 'master' into nata

Conflicts:
	.gitignore
	protected/controllers/PcucController.php
	protected/views/pcuc/index.php
	protected/views/pcuc/view.php
todo