updated with new time stamp structure
Merge branch 'master' of https://github.com/ruffsl/CS7495P2