commit de foufou
Merge branch 'master' of https://github.com/deminyx/stratego

Conflicts:
	gui/structures.h