adds location search and options for directions
Merge branch 'master' of github.com:kylefdoherty/citi-bike-search

Conflicts:
	app/controllers/stations_controller.rb
	app/views/stations/index.erb
	app/views/stations/results.erb