relocated angualr and bootsrap files to fix errors in the console and I feel much beter for doing this
fixed 1 error :)
messed with asset pipeline
merge fix
Merge pull request #14 from Mathdrquinn/master

relocated angualr and bootsrap files to fix errors in the console and I ...
joined modules
ive done nothing
added friendship database, added columns to friendship database, added user and friendship controllers, added resources in routes.rb, added models for these,  all of this will give us the ability to connect users and create friends list
Merge pull request #15 from Mathdrquinn/master

joined modules from 2 to 1
added gitignore and fixed merge errors
Merge pull request #16 from belindahare/master

creating ability to connect users
fixed haml error
Merge pull request #17 from belindahare/master

fixed haml error
ng route works
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team3
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.