Merge branch 'master' of matix/Servo into master

Source/main.cpp

@@ -63,7 +63,7 @@ void Servo::formatCommand(std::string* command)
     auto p2 = m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(2);
     auto p3 = m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(3);
     auto p4 = m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(4);
-    auto p5 = m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(4);
+    auto p5 = m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(5);
 
     *command = StringSub(*command, "[me]", p0 != nullptr ? p0 : "");
     *command = StringSub(*command, "[p0]", p0 != nullptr ? p0 : "");