nothing important
fixed merge conflict
finished styling activity show page
Merge branch 'user' into design
show message page styled
Merge branch 'user' into design
not important
i think i did everything?
merging
little css things
merging
Merge branch 'user' into front-end