variable change
change variable name
Merge branch 'new_change'

Conflicts:
	mean.py
variable change
change variable name
Merge branch 'new_sth'

Conflicts:
	mean.py