Merge pull request #62 from toannguyenle/rails_toan

update merge errors
Merge pull request #63 from toannguyenle/rails_toan

update merge errors
just started working on layout
Merge pull request #64 from toannguyenle/branch3

just started working on layout
update api endpoint