casi nada
update and fixed conflicts

Conflicts:
	css/vergel.css
	less/extras.less
	less/variables.less