Update .gitignore
Update JS dependancies
Merge branch 'test-merge' of github.com:atiberghien/makerscience into test-merge
Huge and ugly merge
Remove obsolete file