Merge master changes

This commit is contained in:
2016-12-05 18:55:48 +01:00
11 changed files with 49 additions and 831 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.idea/