added @uploader to trail#show and removed hardcoded uploaded uploader info, added uploader user_id to trail table in seed data
Merge branch 'master' into views

connect
changed .trailphoto margin-bottom from -18px to -38px