Conflicts: transfersh-server/static/index.html transfersh-server/static/scripts/main.js transfersh-server/static/styles/main.css transfersh-web/index.html