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

Conflicts:
	index.html
Revert "Merge branch 'master' of https://github.com/ilenepop/ilenepop.github.io"

This reverts commit c198e107e4b3b0da06f24466e672acb54109c37d.
Merge branch 'master' of https://github.com/ilenepop/ilenepop.github.io