error control for the buttons on timestamp
Merge pull request #8 from TobyPalmer/christoffer

Christoffer
small fix
Merge branch 'master' into Tobias
Merge pull request #9 from TobyPalmer/Tobias

Tobias
merge conflicts