pull requests: adds merging time calculation
merge

Conflicts:
	go.py