try to fix local repo
Merge branch 'master' of github.com:hexanom/ALIA-Reversi-IA

Conflicts:
	settings.pl
	ui/display_gui.pl