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

Conflicts:
	test/src/main/java/test/Strings.java
Merge branch 'master' of https://github.com/dickerpulli/git.git into b1