Merge remote-tracking branch 'bitbucket/master'

# Conflicts:
#	.gitignore

.gitignore

@@ -1,6 +1,14 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+<<<<<<< HEAD
+=======
+*.dll
+*.lib
+*.ttf
+3thlib/
+
+>>>>>>> bitbucket/master
 # User-specific files
 *.suo
 *.user
@@ -242,6 +250,7 @@ ModelManifest.xml
 .paket/paket.exe
 
 # FAKE - F# Make
+<<<<<<< HEAD
 .fake/
 
 
@@ -252,3 +261,6 @@ lib/*
 sdlp1/data/*
 */simhei.ttf
 
+=======
+.fake/
+>>>>>>> bitbucket/master

sdlp1.1.sln

@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdlp1.1", "sdlp1.1\sdlp1.1.vcxproj", "{08BC09F7-F4AD-426A-9C4A-BAF2E9A2AB41}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{08BC09F7-F4AD-426A-9C4A-BAF2E9A2AB41}.Debug|x64.ActiveCfg = Debug|x64
+		{08BC09F7-F4AD-426A-9C4A-BAF2E9A2AB41}.Debug|x64.Build.0 = Debug|x64
+		{08BC09F7-F4AD-426A-9C4A-BAF2E9A2AB41}.Debug|x86.ActiveCfg = Debug|Win32
+		{08BC09F7-F4AD-426A-9C4A-BAF2E9A2AB41}.Debug|x86.Build.0 = Debug|Win32
+		{08BC09F7-F4AD-426A-9C4A-BAF2E9A2AB41}.Release|x64.ActiveCfg = Release|x64
+		{08BC09F7-F4AD-426A-9C4A-BAF2E9A2AB41}.Release|x64.Build.0 = Release|x64
+		{08BC09F7-F4AD-426A-9C4A-BAF2E9A2AB41}.Release|x86.ActiveCfg = Release|Win32
+		{08BC09F7-F4AD-426A-9C4A-BAF2E9A2AB41}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal