Merge pull request #2 from Sue-Yi-FAN/master

every thing update
Merge pull request #3 from Sue-Yi-FAN/back-end

Merge pull request #2 from Sue-Yi-FAN/master