Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gitignore

composer.json

@@ -0,0 +1,21 @@
+{
+    "name": "provm/database",
+    "description": "Database loader for j4mie/paris",
+    "type": "library",
+    "require": {
+        "j4mie/paris": "^1.5"
+    },
+    "license": "MIT",
+    "autoload": {
+        "psr-4": {
+            "ProVM\\Database\\": "src/",
+            "ProVM\\Common\\": "common/"
+        }
+    },
+    "authors": [
+        {
+            "name": "Aldarien",
+            "email": "aldarien85@gmail.com"
+        }
+    ]
+}