added profile images to seeds
added basic layout to troop members page
added somewhat normal looking pictures to scouts troop page
updates to user index page.  user show page needs to be more fleshed out
pull down remote master
merge local branches with master