Merge pull request #2 from chrisniael/master

Update
update
Merge branch 'master' of https://github.com/cocobear411/makeup
Merge pull request #3 from chrisniael/master

Update
update
Merge pull request #4 from chrisniael/master

update
Modify the css.
Merge branch 'master' of https://github.com/cocobear411/makeup
upadate
Merge pull request #5 from chrisniael/master

update
update
Modify article style.
Merge pull request #5 from cocobear411/master

Modify article display style