comment button + functionality on TimeStampActivity
delete button + functionality in TimeStampActivity
Merge pull request #24 from TobyPalmer/felicia

Felicia