asddas
Merge branch 'master' of
ssh://git@github.com/OliverKehl/java_workspace.git

Conflicts:
	kangjihua.java