no se!!
listo para probar en produccion
listo
sad
asdasd
Merge branch 'master' of https://github.com/zykorwx/cupones

Conflicts:
	cupones/settings.pyc
	public/static/css/cupertino/jquery-ui-1.10.1.custom.css
	public/static/css/groundwork.css
	public/templates/base/base.html
	public/templates/cupon/form_cupon.html
	public/templates/cupon/form_promocion.html
	public/templates/cupones/index.html