Merge remote-tracking branch 'origin/chaos' into chaos

.gitignore

@@ -0,0 +1,24 @@
+# Compiled class file
+*.class
+
+# Package Files
+*.jar
+
+# Gradle
+.gradle
+build/
+**/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+# IntelliJ IDEA
+.idea
+*.iws
+*.iml
+*.ipr
+/out/
+
+# Releases
+!releases/**/*.jar
+
+# Extra
+.sync/