refined to seconds
Merge branch 'master' of https://github.com/ajauhri/712_project