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

Conflicts:
	app/views/trails/new.html.erb
Form change
Form change again