ZAF
Merge branch 'theGame' of http://github.com/FlorentBossart/theGame into theGame

Conflicts:
	Zaf.rb
Merge branch 'theGame' of http://github.com/FlorentBossart/theGame into theGame