first commit: testing build ok
Merge branch 'master' of github.com:micfan/wars