cambios
xnxncerge branch 'master' of https://github.com/bengui/giombu

Conflicts:
	public/css/style.css
	views/deals/show.jade