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

Conflicts:
index.html
fix