add splash page
add trailblaze_background image
add penultimate hour
Blah
Merge branch 'master' of https://github.com/brigittewarner/trailblaze

Conflicts:
	app/views/layouts/application.html.erb
br
New trails
New trail
Congratualtions
Yay
fix trailhead
Assets
Make trail.user_id equal current_user.id
add trailmarkers index
Add MyTrails
User can choose to make trails available to public
Fix navbar layout and user badge relation model