Changed to handle a file
Made an additional change along branch
Changed file name in Master
Merge branch 'new_change'

Conflicts:
	mean.py