fixed
Merge branch 'master' of github.com:ECatx/ECatx.github.io into source

Conflicts:
	sass/custom/_colors.scss
	sass/custom/_layout.scss