modify foo.oy
modify bar.oy
rm order.py
o
merge develop branch
nothing
Merge branch 'master' of github.com:wxing89/team_py into develop

Conflicts:
	recommend.py
	test.py
edit on mx