Merge pull request #1 from mishaoze/b2

branch commit
master commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Main.java
mm
Merge remote-tracking branch 'origin/master' into b2

Conflicts:
	src/Main.java