diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..687dcc4
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+language: java
+jdk:
+    - oraclejdk8
+sudo: false
+script: mvn clean install -f tdt4140-gr1864/pom.xml $MAVEN_CLI_OPTS
+notifications:
+      email: false
+after_success:
+    - bash <(curl -s https://codecov.io/bash)
diff --git a/README.md b/README.md
index 20ba138..40990dd 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,13 @@
 <h1><img src="https://i.imgur.com/NaEWdZ3.png" width="100" />&nbsp; &nbsp; E.C.
 Shop :apple: :bacon: :hamburger: :stuffed_flatbread:</h1>
 
-<img src="https://gitlab.stud.iie.ntnu.no/tdt4140-2018/64/badges/master/build.svg">
-<img src="https://gitlab.stud.iie.ntnu.no/tdt4140-2018/64/badges/master/coverage.svg">
+<img src="https://travis-ci.org/strandlie/EC-Shop.svg?branch=master">
+<img src="https://codecov.io/gh/strandlie/EC-Shop/branch/master/graph/badge.svg">
 
 This is a school project developed associated with the subject TDT4140 at NTNU.
+The project was developed using SCRUM, split into three sprints. A private
+Gitlab-instance was used - this repo is a clone of the final release. Issues,
+wiki and pull-requests were not migrated.
 
 E.C. Shop is a system for tracking customers in a store, similarly to systems
 such as Amazon's Amazon Go. The system tracks customer inventories as they move
@@ -18,6 +21,8 @@ items in stock, and visualizations of customer movements throughout the shop.
 	- [Data providers](#features-for-data-providers-customers)
 - [Installation](#installation)
 - [System Architecture](#system-architecture)
+- [Tools we've used](#list-of-tools-weve-used)
+- [Documentation](#documentation)
 
 ## Feature overview
 ### Features for service providers / shop owners
@@ -113,3 +118,7 @@ The `app` module is responsible for starting and stopping the system cleanly.
 * Eclipse - An open source IDE that is primarly used to develop in this project
 * JavaFX - A set of graphics and media packages.
 * JDBC - Short for Java Database Connectivity and is a standardized interface for java applications that communicates with a database. 
+
+## Documentation
+[REST-API documentation is found here.](https://github.com/strandlie/EC-Shop/blob/master/tdt4140-gr1864/web.server/README.md)
+
diff --git a/tdt4140-gr1864/app.ui/src/test/java/tdt4140/gr1864/app/ui/FxAppTest.java b/tdt4140-gr1864/app.ui/src/test/java/tdt4140/gr1864/app/ui/FxAppTest.java
deleted file mode 100644
index d2fa416..0000000
--- a/tdt4140-gr1864/app.ui/src/test/java/tdt4140/gr1864/app/ui/FxAppTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package tdt4140.gr1864.app.ui;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.testfx.framework.junit.ApplicationTest;
-
-public class FxAppTest extends ApplicationTest {
-	
-	@BeforeClass
-	public static void headless() {
-		if (Boolean.valueOf(System.getProperty("gitlab-ci", "false"))) {
-			GitlabCISupport.headless();
-		}
-	}
-
-    @Test
-    public void testFxApp() {
-    	Assert.assertTrue(true);
-    }
-}
diff --git a/tdt4140-gr1864/app/src/main/java/org/app/App.java b/tdt4140-gr1864/app/src/main/java/org/app/App.java
index 54560bd..d7b5ba6 100644
--- a/tdt4140-gr1864/app/src/main/java/org/app/App.java
+++ b/tdt4140-gr1864/app/src/main/java/org/app/App.java
@@ -20,7 +20,7 @@ public class App implements AppListener {
 	private static App app;
 	
 	/**
-	 * The Thread running the DataMocker.
+	 * The Thread for running the DataMocker.
 	 */
 	private Thread mockerThread;
 	
@@ -74,4 +74,4 @@ public static void main(String[] args) throws Exception {
     	App.initialize();
     	OwnerApp.launch(OwnerApp.class, args);
     }
-}
\ No newline at end of file
+}