Merge pull request #1 from chrisniael/master

Update code from original
add others.
Merge branch 'master' of https://github.com/cocobear411/makeup
modify css of site.
Solve conflict.
Merge branch 'cocobear411-master'