implement max_time
tests!
Merge branch 'master' of github.com:catlee/runner

Conflicts:
	runner.cfg