Merge pull request #203 from iam-merlin/master

Nothing really interesting, I just add to gitignore netbeans directory (not only netbeans private data)

.gitignore

@@ -11,3 +11,4 @@ vendor/
 /.project
 /.idea
 composer.phar
+/nbproject