Started battle stuff.
Fixed a merge conflict. Added battle stuff.
Merge branch 'master' of github.com:matthorning-sq1/rhizome