initial checkin
Merge branch 'master' of https://github.com/zhiweicai/test