first commit: basic build passed
Merge branch 'master' of github.com:micfan/wars

Conflicts:
	.gitignore
	README.md