Merge pull request #2 from liligeng111/master

111
add linechart
merge
改来改去又roll back了
change rate:
Merge remote-tracking branch 'trunk/master'
change