Commit version before adding Marcin's part
Merge branch 'master' of https://github.com/szymonlyszkowski/AIProjectWorkspace

Conflicts:
	DiceWarsGame/.idea/workspace.xml
	DiceWarsGame/src/com/example/main/GameState.java
	DiceWarsGame/src/com/example/main/GraphCanvas.java
Merge branch 'master' of https://github.com/szymonlyszkowski/AIProjectWorkspace

Conflicts:
	DiceWarsGame/.idea/workspace.xml
	DiceWarsGame/src/com/example/main/GameState.java
	DiceWarsGame/src/com/example/main/GraphCanvas.java
Graph saved in .txt file; choosing a map from the file;
Launching from cmd: java -cp <path>json-simple-1.1.1.jar;. com.example.main.MainWindow [arguments]
args[0]: 1-generate map, 2-start game
case 1: args[1]-nrOfVertices, args[2]-maxNrOfEdges, args[3]-outputfile
case 2: args[1]-inputfile
Graph saved in .txt file; choosing a map from the file;
Launching from cmd: java -cp <path>json-simple-1.1.1.jar;. com.example.main.MainWindow [arguments]
args[0]: 1-generate map, 2-start game
case 1: args[1]-nrOfVertices, args[2]-maxNrOfEdges, args[3]-outputfile
case 2: args[1]-inputfile
Działające tworzenie i wczytywanie mapy, podłączona i działająca część Krzyśka (jFuzzyLogic)

Odpalane z cmd:
(z poziomu AIProjectWorkspace\DiceWarsGame\out\production\DiceWarsGame)

java "<ścieżka gdzie jest jFuzzyLogic.jar i json-simple-1.1.1.jar>\*"; com.example.main.MainWindow

parametry:
(dla generowania mapy): 1 nrOfVertices maxNrOfEdges <ścieżka>outputfile (domyślnie tworzone w out/production/DiceWarsGame)
(dla włączenia gry): 2 <ścieżka>inputfile