тест
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/Character.java
Merge branch 'master' of https://github.com/krastoss/JavaTeamwork

Conflicts:
	src/main/Character.java