added conditional formatting for message alignment and changed buttons on conversations
Merge branch 'master' of https://github.com/mfouladi/CollegeHotlineTest