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

Conflicts:
	PathFinding/.idea/workspace.xml