add some test
test merge
Merge branch 'dev'

Conflicts:
	src/test/StringTest.java
test merge2
test merge 2
Merge branch 'dev'