Home cleaning 02
conflict resolve

Conflicts:
	assets/css/custom.css