modify padding and margin
merge

Conflicts:
	partials/about.html