Changed to read from file.
Renamed data file.
Changed on the same line.
Change for conflict.
Merge branch 'second_branch'

Conflicts:
	mean.py