Combine two readme files into one
Merge branch 'master' of https://github.com/gremlin12/social_network