first commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/src/main/java/test/Strings.java