Merge branch 'master' of https://github.com/mekwars-legends/www

Conflicts:
	_img/armybuilding.jpg
Merge branch 'master' of https://github.com/mekwars-legends/www