Merge branch 'hotfix/ajoutePion_hotfix'
ajout couleur adverse
Ajout du display [a tester]
changement display
ajout du gitignore
Merge branch 'master' of https://github.com/jdugue/Othello
Delete main.pl~

suppression des temp
Merge branch 'release/1.0'

Conflicts:
	display.pl
	main.pl

solved using mines
merge fix
restore main.pl
Merge branch 'hotfix/v1.0_merge_fix' into develop