Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -0,0 +1,18 @@
+language: android
+
+jdk:
+    - oraclejdk8
+    - openjdk8
+
+android:
+  components:
+    # The SDK version used to compile your project
+    - android-26
+
+    # Additional components
+    - extra-google-google_play_services
+    - extra-google-m2repository
+    - extra-android-m2repository
+    - addon-google_apis-google-26
+
+script: ./gradlew desktop:dist

README.md

@@ -1,5 +1,7 @@
 ![Imgur](https://i.imgur.com/w4N0yhv.png)
 
+[![Build Status](https://travis-ci.org/Anuken/Mindustry.svg?branch=master)](https://travis-ci.org/Anuken/Mindustry)
+
 A pixelated sandbox tower defense game made using [LibGDX](https://libgdx.badlogicgames.com/). Winner of the [GDL Metal Monstrosity Jam](https://itch.io/jam/gdl---metal-monstrosity-jam).
 
 _[TODO list](TODO.md)_