sysout2
Merge remote-tracking branch 'origin/master'

Conflicts:
	tutorial/src/main/java/com/khorevich/App.java
sysout21