Gooltest modif
Gool test merged
Merge branch 'master' of https://github.com/viking14/GOOL

Conflicts:
	src/gool/test/GoolTest.java