create romate breach
Merge branch 'master' of https://github.com/orangedy/javatest.git into dev
dev commit
Update dev.txt
Update dev.txt
Update dev.txt
add some test
test merge
Merge branch 'dev'

Conflicts:
	src/test/StringTest.java