fixed bugs on home page
Merge remote-tracking branch 'origin/master'
 where did da less file go
Conflicts:
	css/main.css
	css/main.less
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.less