rm topic_create.js~ file
Merge branch 'master' into development
edit README.md
Merge branch 'master' into development
ignore supervisord.conf
fix bug: add content type image/x-icon
fix bug: add content type image/x-icon
fix bug: fix first send message bug
Merge branch 'master' into development
refractor: test.py
refactor: add websocket
revert controllers/user.py
revert controllers/user.py
revert controllers/user.py
revert user.js and layout.html
add feature: add online users show
add feature: add user index online show
fix bug: fix db_session bug in on_close
fix bug: fix message outside of db_session bug
add feature: add test