merge

Conflicts:
server.js
server