before pull
merge conflicts
resolved server issues
set up chat index page
merged in master
styled mail page
cover photo almost working
conversations working - next to test conversations with multiple users
finished cover photo thank you very much
Merge branch 'messagesStyling2' into merge4
almost merged
successful merge
added flirts for dickbutt andrew