detail
Merge branch 'master' of https://github.com/Aomeas/1GAM1014

Conflicts:
	assets/maps/map.tile
Merge branch 'master' of https://github.com/Aomeas/1GAM1014
Merge branch 'master' of https://github.com/Aomeas/1GAM1014
addition of the non-fonctionnal version of A star algorithm