Fightingteam

Merging our fightingteam branch into master branch