modify foo.oy
modify bar.oy
o
from toshiba
toshiba
nothing
Merge branch 'master' of github.com:wxing89/team_py into develop

Conflicts:
	recommend.py
	test.py
rm order data
edit on mx
rebuild sim methods
Merge pull request #2 from wxing89/develop

Develop