add something for function 2; add sth for function 1; change ui for function 3
t
Merge branch 'xiaobaicoding-master'