added static timer and update
fixed merge conflict
add admin to user
fixed merges
Merge pull request #48 from kunovsky/timer

Timer