Переменные 1
Merge branch 'master' of https://github.com/rusakover/freewords

Conflicts:
	js/main.js