Merge remote-tracking branch 'origin/master'

Conflicts:
	alltimerecord.R
	gamesbetweensummary.R