first timestamp test passing
merging timestamp changes
Merge branch 'master' of github.com:cdg77/tap-app