Added Fighter
Merge branch 'fighter'