Merge remote-tracking branch 'origin/master'

elect86 · elect86 · commit dd2a89e02278 · 2018-07-31T15:14:28.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,9 @@
-/build/
+# Folders related to build output
+build/
 
-.idea/
+# Gradle internal
+/.gradle/
+
+# IntellJ IDEA specific folders
+/.idea/
+out/
