Edited index.html
changed port on index.js
updated index again
Merge branch 'staging'