add timestamp feature
Merge pull request #32 from goinstant/colinmacdonald/22-timestamps

Add timestamp feature