Readded Dividing and Merging

github destroyed my merging and dividing army methods, readded them with
this commit.
Merge branch 'master' of https://github.com/Psiryu/4000War