Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	src/study/java/designpattern/decorator/Beverage.java
	src/study/java/designpattern/decorator/DarkRoast.java
	src/study/java/designpattern/decorator/Decaf.java
	src/study/java/designpattern/decorator/Espresso.java
	src/study/java/designpattern/decorator/HouseBlend.java
	src/study/java/designpattern/decorator/Milk.java
	src/study/java/designpattern/decorator/Mocha.java
	src/study/java/designpattern/decorator/Soy.java
	src/study/java/designpattern/decorator/Whip.java
	src/study/java/main/JavaProgramTest.java