calculated total
Merge branch 'master' of https://github.com/CSE512-14W/fp-eamullen-tanvir-willrs
almost done