test commit
Merge https://github.com/MagnusEngdal/js-demo-1