Merge branch 'master' of http://gogs:3000/patrick/Trixy into 2-EmotionStats

# Conflicts:
#	.gitignore
#	.vs/Trixy/v17/.suo

.gitignore

@@ -1,2 +1,5 @@
 /.vs
-*/__pycache__
+/.vs/Trixy/FileContentIndex/*
+/.vs/Trixy/v17/*
+/__pycache__
+/DynLoader/__pycache__

Trixy.pyproj

@@ -21,6 +21,9 @@
     <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="DynLoader\main.py" />
+    <Compile Include="DynLoader\modInfo.py" />
+    <Compile Include="DynLoader\__init__.py" />
     <Compile Include="main.py" />
     <Compile Include="Stats\AdminStats.py" />
     <Compile Include="Stats\DeviceStats.py" />
@@ -33,6 +36,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include=".gitignore" />
+    <Content Include="DynLoader\__pycache__\modInfo.cpython-37.pyc" />
+    <Content Include="DynLoader\__pycache__\__init__.cpython-37.pyc" />
     <Content Include="LICENSE" />
     <Content Include="README.md" />
     <Content Include="Stats\__pycache__\AdminStats.cpython-37.pyc" />
@@ -48,6 +53,11 @@
     <Folder Include="Stats\" />
     <Folder Include="Stats\__pycache__\" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="DynLoader\" />
+    <Folder Include="DynLoader\__pycache__\" />
+    <Folder Include="mods\" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
   <!-- Uncomment the CoreCompile target to enable the Build command in
        Visual Studio and specify your pre- and post-build commands in

main.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
+import DynLoader as dyn
 
 if __name__ == "__main__":
-    pass
+    mod = dyn.DynLoaderMod("mods/")