8a4185815f
Conflicts: lib/server/index.js src/server/index.coffee views/app/index.html
Conflicts: lib/server/index.js src/server/index.coffee views/app/index.html