second
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	testsrc/training/ideas/java/utills/StringUtilTest.java
first time