added troop news to show.html.erb
added blog show page
new blog post page is working
udpated seed data for troops blog
added profile photos to asset pipeline
fixed merge conflicts