button styling
Resolved github conflict

Conflicts:
	client/style-guide/style.css