Updated port on index.js
Merge branch 'server'