Add new comment after Maria's modification
Add new comment after Maria's modification on master branch
Merge branch 'new_change'

Conflicts:
	mean.py
Add new comment
Add new comment
Merge branch 'dummy_branch'

Conflicts:
	mean.py