Added time calculations
Merge branch 'master' of https://github.com/albchu/CPSC-433-Project