Enda mõistus hakkas otsa saama
Merge branch 'master' of https://github.com/Kkarpuk2/i377

Conflicts:
	WebContent/WEB-INF/web.xml