Modelos Usuarios y Ranking
Merge remote-tracking branch 'origin/master'

Conflicts:
	rank/entidades/models.pyc
	rank/servicios/models.pyc
Merge branch 'master' of https://github.com/eumati/rank

Conflicts:
	rank/db.sqlite3
	rank/entidades/migrations/0001_initial.pyc
	rank/entidades/migrations/__init__.pyc
	rank/servicios/migrations/0001_initial.pyc
	rank/servicios/migrations/__init__.pyc