home page
Merge pull request #48 from toannguyenle/rails_toan

Rails toan
Merge pull request #49 from toannguyenle/anotherBranch

home page
resolve merge conflict