Fixed conflicts.

.idea/misc.xml

.idea/vcs.xml

src/main/java/edu/ntnu/stud/chaosgame/Main.java

...du/ntnu/stud/chaosgame/controller/game/ChaosGameTask.java

...u/stud/chaosgame/controller/utility/ChaosGameMonitor.java

.../java/edu/ntnu/stud/chaosgame/model/game/ChaosCanvas.java

...main/resources/descriptions/saved_descriptions/Julia2.txt

...main/resources/descriptions/saved_descriptions/desc_4.txt

...st/java/edu/ntnu/stud/chaosgame/game/ChaosCanvasTest.java

.../java/edu/ntnu/stud/chaosgame/model/data/ComplexTest.java

...ava/edu/ntnu/stud/chaosgame/model/data/Matrix2x2Test.java

...java/edu/ntnu/stud/chaosgame/model/data/Vector2DTest.java