narrative directions for transit
resolved conflict

Conflicts:
	client/filter-view/style.css
narrative directions for transit
Merged changes from master
Added some copy to the welcome page