new_change
Change variable name to numberLine
Merge branch 'new_change'

Conflicts:
	mean.py
practiceconflict
change
Final change