added timer
timer works
smooth update
Merge branch 'master' of github.com:vladstoick/proiectoti