こちらは用済みなので削除
Merge branch 'master' of https://github.com/anoyetta/HPBarOverlay

Conflicts:
	ACTPlugin/FFXIV_ACT_Plugin.dll
	FFXIV.ACTRapper/FFXIV.ACTRapper.csproj
	FFXIV.ACTRapper/FFXIVHacker.ChatLog.cs
	FFXIV.ACTRapper/FFXIVHacker.Combatant.cs
	FFXIV.ACTRapper/FFXIVHacker.Player.cs
	FFXIV.ACTRapper/FFXIVHacker.Target.cs
	FFXIV.ACTRapper/FFXIVHacker.cs
	FFXIV.MobHuntersCalender.Client/FFXIV.MobHuntersCalender.Client.csproj
	FFXIV.MobHuntersCalender.Client/MobHuntersCalendarDataSet.Designer.cs
	FFXIV.MobHuntersCalender.Client/MobHuntersCalendarDataSet.xsc
	FFXIV.MobHuntersCalender.Client/MobHuntersCalendarDataSet.xss
	FFXIV.MobHuntersCalender.Client/Properties/Settings.Designer.cs
	FFXIV.MobHuntersCalender.Client/Properties/Settings.settings
	FFXIV.MobHuntersCalender.Client/SettingsMobHuntControl.Designer.cs
	FFXIV.MobHuntersCalender.Client/SettingsMobHuntControl.cs
	FFXIV.MobHuntersCalender.Client/SettingsMobHuntControl.resx
	FFXIV.MobHuntersCalender.Client/app.config
	HPBarOverlay.SoundPlayer/HPBarOverlay.SoundPlayer.csproj
	HPBarOverlay.sln
	HPBarOverlay/HPBarOverlay.csproj
	HPBarOverlay/HPBarOverlaySettings.cs
	HPBarOverlay/MainForm.Alarm.cs
	HPBarOverlay/MainForm.cs
	HPBarOverlay/Properties/AssemblyInfo.cs
	HPBarOverlay/SoundPlayerRapper.cs