fixed 2 js/ that I missed earlier
Merge remote-tracking branch 'origin/workingBranch'