small uplaod of new files.
Merge branch 'master' of https://github.com/Alaev/warGame

Conflicts:
	b.php