Conflict with the css

[newhoteng]

Compare the conflicts and make a decision on what to delete or keep.

[BranBayou]

Some of your commits are not descriptive, try to give descriptive commits messages next time.