fixed calculator to be per week; closes #1038
Merge pull request #1041 from affektive/calculator

fixed calculator to be per week; closes #1038