commit pour correction de conflit
suppression du git ignore
Merge branch 'master' of https://github.com/vwilmet/othello_pdp

Conflicts:
	OthelloKernel/src/com/controller/test/GCShell.java