Committing changes
Merge branch 'evaluation' of https://github.com/Drin/spam into evaluation

Fixed the calculation of total time because it was wrong