Conflicts: AndorsTrail/res/values/strings.xml AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java