try to fix a conflict
Merge branch 'new_design' of
https://github.com/ophirdj/GGP-Player-Project.git into new_design

Conflicts:
	ggp-base/src_experiments/main/TestingPanel.java