added timing
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	script/src/VCFAnnotator.py