Merge branch 'dev' of Repos/Funscripta into master

.gitignore

@@ -341,3 +341,4 @@ ASALocalRun/
 !.vscode/launch.json
 !.vscode/extensions.json
 
+/Funscripta-Setup

Funscripta.sln

@@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.30104.148
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Funscripta", "Funscripta\Funscripta.csproj", "{FA566A7A-A69B-4136-A0CC-4D6FBEB69DB5}"
 EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Funscripta-Setup", "Funscripta-Setup\Funscripta-Setup.vdproj", "{52C377CB-D6DB-42D3-A4EC-E692B3D72C50}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,8 @@ Global
 		{FA566A7A-A69B-4136-A0CC-4D6FBEB69DB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FA566A7A-A69B-4136-A0CC-4D6FBEB69DB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FA566A7A-A69B-4136-A0CC-4D6FBEB69DB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52C377CB-D6DB-42D3-A4EC-E692B3D72C50}.Debug|Any CPU.ActiveCfg = Debug
+		{52C377CB-D6DB-42D3-A4EC-E692B3D72C50}.Release|Any CPU.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Funscripta/Program.cs

@@ -15,7 +15,6 @@ namespace Funscripta
         [STAThread]
         static void Main( string[] args )
         {
-            args = new string[] { @"F:\VR\Animes\Lewd FRAGGY\Kantai Collection - Shimakaze Live Fire Dildo - Oculus Rift, HTC VIVE -.mp4" };
             var _args = ParseArguments( args );
             var video = _args.Get( "v" );
             var script = _args.Get( "s" );