Modify index img size.
Add index of article and other something.
Merge branch 'master' of https://github.com/chrisniael/makeup
Modify article tag name.
Solve conflict.
Merge branch 'cocobear411-master'
Merge pull request #2 from chrisniael/master

Update