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
added gitignore and fixed merge errors
Merge pull request #16 from belindahare/master

creating ability to connect users