Shell for Battle
Merge conflicts in Battle.c