# Conflicts: # app.js
# Conflicts: # package.json # public/js/service/client.page.js # public/js/service/socket-chat.js
