editing conditions
Merge branch 'gh-pages' of https://github.com/mohamednaguib/egwasalnypages into gh-pages

Conflicts:
	game/conditions.ar.html