one-on-one and group chat major changes
Minor changes to second and third section
images and layout
Merging issue-9 into develop and resolving conflicts