Finished Sprint2 tasks (chen1005)

Cheers Great Chen BABA!!!