modify in master
modify in method1 branch
Merge branch 'master' into method1

Conflicts:
	X/src/console/Main.java
a
b
Merge branch 'method1'

Conflicts:
	X/src/console/Main.java
z
add method4 in master