local change to test
Merge branch 'master' of github.com:Eclipse932/SyncUp_backend

merge conflict
 local change
fix conflict
Merge branch 'master' of github.com:Eclipse932/SyncUp_backend

"merge conflict"
Merge branch 'master' of github.com:Eclipse932/SyncUp_backend

merge
add deleteActivity
add a route for deleteActivity
add deleteActivity