new change change
newer change change
Merge branch 'new_change'

Conflicts:
	mean.py
sum = 3
sum = 4
Merge branch 'Catherine_new_change'

Conflicts:
	mean.py