bug fixes
Merge branch 'master' of github.com:antonmks/Alenka
Bug fix
Merge branch 'master' of github.com:antonmks/Alenka

Conflicts:
	lex.yy.c