# Conflicts:
#	models/designPattern/Bridge.Json
#	models/designPattern/Iterator.Json
#	models/designPattern/Strategy.Json
#	src/main/java/designPatternExtensions/designPattern/AbstractFactory.java
#	src/main/java/designPatternExtensions/designPattern/Bridge.java
#	src/main/java/designPatternExtensions/designPattern/Command.java
#	src/main/java/designPatternExtensions/designPattern/Iterator.java
#	src/main/java/designPatternExtensions/designPattern/Observer.java
#	src/main/java/designPatternExtensions/designPattern/Prototype.java
#	src/main/java/designPatternExtensions/designPattern/TemplateMethod.java
#	src/main/java/designPatternExtensions/designPattern/Visitor.java
#	src/test/java/generator/TestMultipleContexts.java

・パッケージ deltaAlgebra を作成し，デルタ代数関連のクラスを移動．
・複数コンテキストがある場合に，DeltaComplex#merge(DeltaComplex) を使ってマージ演算をするように．