buttons for style guide
resolve conflict

Conflicts:
	client/style-guide/style.css