Logos y admin panel
Merge branch 'master' of https://github.com/monkeythecoder/nuevo_ctin

Conflicts:
	img/.DS_Store