Merge pull request #3 from phamvanhung2e123/develop

fix bug
new1
new2
new3
Merge pull request #4 from phamvanhung2e123/new

New
develop4
develop5
develop6