Howie changes.
Merge branch 'master' of https://github.com/howinator/Reddit-Families
pulling Sarang's
Fixed merge conflicts. Used Sarang's code.