gamemech change
Merge branch 'master' of https://github.com/smiles/codeninja

Conflicts:
	GameOfWar/GameOfWar/GameMech.cs