Signed-off-by: ada87 <ada87@163.com>
Merge branch 'master' of https://github.com/ada87/DesignPattern

Conflicts:
	src/com/xdnote/DesignPattern/creational/factoryMethod/Client.java

Signed-off-by: ada87 <ada87@163.com>