pulling
Merge branch 'master' of github.com:ajgrover/CS108FinalProject
Merge branch 'master' of github.com:ajgrover/CS108FinalProject
main feed - friend activity and popular finished
Merge branch 'master' of github.com:ajgrover/CS108FinalProject