Merge pull request #12 from DreamToWin/develop

Merge pull request #8 from DreamToWin/phucpm
update user
Merge branch 'phucpm' of https://github.com/DreamToWin/funny into phucpm
Delete composer.json~
Merge pull request #13 from DreamToWin/phucpm

Add user
update code user frontend
Merge branch 'phucpm' of https://github.com/DreamToWin/funny into phucpm
PhucDaiCa
Merge pull request #14 from DreamToWin/phucpm

Phucpm
Merge pull request #15 from DreamToWin/developer

Developer