Model iniciado
Merge branch 'master' of https://github.com/sipmann/caronas

Conflicts:
	caronas/core/models.pyc