tema
tema objetos
log
todo
Merge remote-tracking branch 'origin/oclean'
xx
log
adios log
adios log de verdad

git rm --cached <archivo>
m
x
x
v
nuevi
Merge remote-tracking branch 'origin/oclean'
por hoy
Merge remote-tracking branch 'origin/oclean'
logros *
Merge branch 'master' into nata

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