he canviat tots els arxius de js
fixed conflicts
Merge branch 'refactor-into-classes'