Merge branch 'master' of gitlab.stud.idi.ntnu.no:carljgu/Wargames

javadoc/allclasses-index.html

javadoc/allpackages-index.html

javadoc/constant-values.html

javadoc/deprecated-list.html

...nt/edu/ntnu/idatt2001/carljgu/FileExtensionException.html

....carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html

...ient/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html

...ient/edu/ntnu/idatt2001/carljgu/army/package-summary.html

....client/edu/ntnu/idatt2001/carljgu/army/package-tree.html

...ljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html

...t/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html

...jgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html

...nt/edu/ntnu/idatt2001/carljgu/battle/package-summary.html

...lient/edu/ntnu/idatt2001/carljgu/battle/package-tree.html

...carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html

...t/edu/ntnu/idatt2001/carljgu/client/BattleController.html

...edu/ntnu/idatt2001/carljgu/client/EditArmyController.html

...arljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html

.../edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html

...nu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html