"Add time counter to reader"
Fix Merge conflicts
Merge branch 'master' of github.com:newenegue/peek_frontend