Merge branch 'master' into Dunn_Works
Merge branch 'master' into Dunn_Works
added a battle help command
Merge branch 'Dunn_Works'
Merge branch 'master' into Geoffs_WIP