Merge remote-tracking branch 'origin/tianyi2' into luhui
Print function modified, test1.cpp removed
Merge remote-tracking branch 'origin/luhui' into tianyi2