Update test1 with master before updating master with test1

Merge branch 'master' into test1

.gitignore

@@ -1 +1,3 @@
 /vendor/
+*.phar
+*.lock

README.md

@@ -0,0 +1 @@
+This is a small php project to test out a routing framework