fin del dia
todo
logros *
log
logros
ignores
Merge pull request #5 from Nataly/oclean

Oclean
Merge branch 'master' into nata

Conflicts:
	.gitignore
	protected/controllers/PcucController.php
	protected/views/pcuc/index.php
	protected/views/pcuc/view.php
todo
log
Merge pull request #7 from Nataly/nata

log
log
logros controller
log
Merge pull request #8 from Nataly/nata

Nata
Merge pull request #9 from Nataly/oclean

tema
ejemplo
log
log
log

log