Added arm, x fighter
Merge branch 'fighter'