Merge branch 'master' into devel

.gitattributes

@@ -0,0 +1 @@
+Jenkinsfile merge=ours 

Jenkinsfile

@@ -0,0 +1,27 @@
+node {
+    def app
+   stage('Clone') { // for display purposes
+      // Get some code from a GitHub repository
+      git 'https://github.com/BrokenFire/BrokenDiscordBot.git'
+   }
+   stage('Build image') {
+        /* This builds the actual image; synonymous to
+         * docker build on the command line */
+
+        app = docker.build("brokenfire/testjenkins","--rm=true .")
+    }
+   stage('Push image') {
+        /* Finally, we'll push the image with two tags:
+         * First, the incremental build number from Jenkins
+         * Second, the 'latest' tag.
+         * Pushing multiple tags is cheap, as all the layers are reused. */
+        // app.push("${env.BUILD_NUMBER}")
+        // app.push("latest")
+        app.push()
+        app.push("${env.BUILD_NUMBER}")
+        
+    }
+    stage('Cleaning'){
+        sh "docker image prune -f"
+    }
+} 

README.md

@@ -1,5 +1,5 @@
 # BrokenDiscordBot
- 
+[![](https://dockerbuildbadges.quelltext.eu/status.svg?organization=brokenfire&repository=brokendiscordbot)](https://hub.docker.com/r/brokenfire/brokendiscordbot/)
 ## Install:
  
 > The easiest method it's to use docker-compose:
@@ -65,4 +65,4 @@
 >     internal:
 >       external: false
 > ```
-> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/)
+> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/) 

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-slate