Merge branch 'master' of https://github.com/lafbeauty/lafbeauty.github.io

Conflicts:
mycool.css
fixed conflict