changed to handle a file.
made additional change.
changed file name.
Merge branch 'new_change'

Conflicts:
	mean.py
Merge branch 'master' of https://github.com/xf5az/project_yisong