narrative directions for transit
resolved conflict

Conflicts:
	client/filter-view/style.css