acitivity model findById method done
merging front-end
Merge branch 'front-end'
activity model complete
fixed merge issues
need to merge user model
message model finished, with sort
merging message model
merged master
added age to user model
added age
age
merged
passed all activities into dashboard route
pulling in master
Merge branch 'master' into front-end
working on profile page, activities added
got activities on dashboard working