added more timestamps
Merge branch 'master' of https://github.com/topched/CMPUT410W14-Group-Project