start working on whiteboard
Merge branch 'test' of ssh://github.com/ziyue1118/chat into test
pull lucas changes