Manager de combate almost done!
Merge origin/master