Merge branch 'master' of github.com:marceloomens/borderwars

Signed-off-by: Marcel Oomens <Marcel.Oomens@cromido.org>

Conflicts:
	LICENSE.md
Merge branch 'master' of github.com:marceloomens/borderwars

Signed-off-by: Marcel Oomens <Marcel.Oomens@cromido.org>

Conflicts:
	LICENSE.md