added a placeholder median function, needs to be replaced
merged upstream

Merge remote-tracking branch 'upstream/master'

Conflicts:
	stats.py