t
Merge branch 'master' of https://github.com/Xeroth95/Astar

Conflicts:
	.gitignore
	Makefile
	main.c