Merge
Merge branch 'master' of https://github.com/brigittewarner/trailblaze

Conflicts:
	app/controllers/trails_controller.rb
	app/models/trail.rb