Cambios de estilo de chokoapp
Se cambiaron algunos estilos de choko app,
Se agregaron las entidades al admin de django
Se agrego la url de perfil
Se comenzo a editar la platilla de perfil
Se hicieron algunos cambios en los modelos, pero sigue haciendo falta hacer cambios.
Se edito la plantilla de perfil.
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
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
imagen que se borro
Delete .DS_Store
Delete .DS_Store
Delete media/css/.DS_Store
Delete media/js/.DS_Store
Renamed logo-pequeño.png -> logo-pequenio.png