Font file path change
Font file path fix
Merge branch 'master' of github.com:popc0rn/popc0rn.github.io

Conflicts:
	generate/src/sass/style.scss