More designing.
Merge branch 'master' of https://github.com/tea2code/fantasy-rts