...

Signed-off-by: NadezhdaMazina <Mazina-Nadegda@yandex.ru>
Merge branch 'master' of https://github.com/feyverkKillSoft/course

Conflicts:
	build/built-jar.properties