eduardo update to js
anything
Merge branch 'develop' of github.com:liampcollins/project2 into develop