fix-lex
Merge branch 'master' of github.com:shadx/4service

Conflicts:
	index.html
conflicts origin