adding a total
Merge branch 'master' into gh-pages

* master:
  adding a total