(77d1794a) Tester's build January 10th, 2020

.gitignore

@@ -11,12 +11,26 @@ bld/
 [Oo]bj/
 [Dd]ebug*/
 [Rr]elease*/
+*.o
 
 # Barotrauma content folder
 BarotraumaShared/Content/
 
+# Misc vs crap 
 *.v12.suo
 *.suo
+*.csproj.user
+*.shproj.user
+*.vcxproj.user
+
+# Platform-specific webm_mem_playback files
+Libraries/webm_mem_playback/libvpx_x64_linux/
+Libraries/webm_mem_playback/libvpx_x64_vs15/
+Libraries/webm_mem_playback/libvpx_x86_vs15/
+Libraries/webm_mem_playback/libwebm_x64_linux/
+Libraries/webm_mem_playback/libwebm_x64_vs19/
+Libraries/webm_mem_playback/libwebm_x86_vs19/
+Libraries/webm_mem_playback/opus_x64_linux/
 
 #performance reports & sessions
 *.vsp
@@ -25,3 +39,6 @@ BarotraumaShared/Content/
 
 # Mac
 *.DS_Store
+
+#Merge script
+temp.txt