mamadas de mac
Delete logo-pequeño.png
Delete .DS_Store
Delete .DS_Store
Delete .DS_Store
Delete .DS_Store
Delete .DS_Store
Delete .DS_Store
Delete .DS_Store
Merge remote-tracking branch 'origin/master' into rulo

Conflicts:
	.DS_Store
	media/.DS_Store
	media/css/.DS_Store
	media/img/.DS_Store
	media/js/.DS_Store
Merge branch 'rulo' of https://github.com/solorulo/ctn_profileme into rulo