Pushed solutions to branch quynhdoan and restored files in branch master