button styling
Resolved github conflict

Conflicts:
	client/style-guide/style.css
fix mode filters classes
fix css button styles
Use a background image on the welcome flow
button styling
fix mode filters classes
fix css button styles
Merge branch 'design' of github.com:conveyal/modeify into design

Conflicts:
	client/filter-view/style.css