footer traffic
merge

Conflicts:
	css/main.scss