more testing and controller additions
Merge branch 'Jordan' of https://github.com/tranlannhi/DayTrip into Jordan

Conflicts:
	app/controllers/trips_controller.rb
	config/routes.rb
Merge branch 'Jordan'