cambios en la vista
cambios en la vista
Merge branch 'master' of https://github.com/cataOrtiz/obs

Conflicts:
	obs/settings.pyc
Merge branch 'master' of https://github.com/cataOrtiz/obs

Conflicts:
	obs/settings.pyc
	observatorio/models.pyc