ui changes
ui changes
Merge branch 'master' of https://github.com/cmpe272-team-spartans/realtime-collaboration