added uptime
added uptime
Merge branch 'master' of https://github.com/jernst/rasptimer