changes
numberline
Merge branch 'new_change'

Conflicts:
	mean.py
confrontation