sizing
Merged changes
Minor change
Merge branch 'design' of github.com:conveyal/commute-planner into design
resolved conflict

Conflicts:
	client/filter-view/style.css
Fix function name
Merge branch 'master' into design