Merge branch 'master' into JD
Added some beginnings to the battle stuff for characters
Merge branch 'JD'