DB Corregida :)
Cambios sencillitos Editor
Merge branch 'Yosh-Reloaded'
Cambios DB y Edición Blog
Ya acabé
WOOOOOOOOOOOOOOO
Ya sirve :)
Merge branch 'master' of github.com:monkeythecoder/nuevo_ctin
Merge branch 'Yosh-Reloaded'
Logos y admin panel
Merge branch 'master' of https://github.com/monkeythecoder/nuevo_ctin

Conflicts:
	img/.DS_Store
Photo cover proyectos

Tienen que importar daniel1.sql
Merge branch 'Yosh-Reloaded'
Merge branch 'master' into Yosh-Reloaded