Fixed and added total total row
Merging conflicts solved script.js