initial stage
Merge branch 'master' of https://github.com/ratones/civ-client

Conflicts:
	.gitignore
	README.md

Conflicts:
	.gitignore
	README.md