Gui stuff
Merge branch 'master' of https://github.com/hoihallohoi/PAF2

Conflicts:
	Patterns.txt
	Strategy image