update styling
resolve merge conflict
Merge pull request #81 from toannguyenle/rails_toan

update styling