Changed variable name
Changed variable name to num1
Merge branch 'new_change'

Conflicts:
	mean.py
change made in branch
change made in master
Merge branch 'another_chang'
Final changes made