Worked on js
Merge branch 'master' of https://github.com/SZanetti/Sweat_for_Swag