test
test2
Merge branch 'master' of https://github.com/gubrian/miniTaobao into test2

Conflicts:
	test
test
Merge branch 'master' of https://github.com/gubrian/miniTaobao into test2
Merge branch 'test2' of https://github.com/gubrian/miniTaobao into test2