timer functionality added
Merge branch 'master' of github.com:andrusieczko/locust