fix css bug of index.
Merge branch 'master' of https://github.com/chrisniael/makeup
Solve the conflict.