added node modules to gitignore
added package json
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team3
no changes, just need to pull upstream master
no changes, just need to pull upstream master
Merge pull request #18 from Mathdrquinn/master

ng route works
wrote code to display all users with an add friend link
Merge pull request #19 from belindahare/master

display user functionality
Merge pull request #20 from bjlinville1/master

added workflow gem and workflows to user.rb. need to pull the route.rb resources down to continue
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
minor style change
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team3