syncing
Merge remote-tracking branch 'origin/master'

Conflicts:
	calcSingleXOneWayTime.py
	testFileGenerator.py