Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team3

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
fixed merge errors
added member routes for workflow to resources in routes.rb
Merge pull request #21 from bjlinville1/master

more workflow
Merge pull request #22 from belindahare/master

added friendships index to welcome controller