a
Merge branch 'master' of https://github.com/c633/path_finding

Conflicts:
	PathFinding/.idea/workspace.xml
	PathFinding/out/production/PathFinding/hedspi10/graphics/Main.fxml
	PathFinding/src/hedspi10/Hedspi10.java
	PathFinding/src/hedspi10/alg/AStar.java
	PathFinding/src/hedspi10/graphics/Main.fxml
	PathFinding/src/hedspi10/graphics/MainController.java