Attempt to fix bug where users' activities would disappear
Merge branch 'master' of github.com:umfoida5/comp4350group5