Patch 1
Patch 2
Merge branch 'patch1'

Conflicts:
	src/main/java/com/leo/test/Test.java