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

Conflicts:
	.idea/workspace.xml
	js/i18n.js