buttons for style guide
resolve conflict

Conflicts:
	client/style-guide/style.css
Mode button options
More button styling
buttons styles – v2
button styling – still not perfect
buttons for style guide
Mode button options
More button styling
buttons styles – v2
button styling – still not perfect
Merge branch 'design' of github.com:conveyal/modeify into design