test commit
test commit 2
fix messages
Merge branch 'chatPage' into phase1