Merge branch 'master' into dockerize

README.md

@@ -7,17 +7,44 @@ In its current state, players can walk around the game universe and collect Biom
 Wiki: [GitHub](https://github.com/simon987/Much-Assembly-Required/wiki)
 Chat: [Slack](https://join.slack.com/t/muchassemblyrequired/shared_invite/enQtMjY3Mjc1OTUwNjEwLTkyOTIwOTA5OGY4MDVlMGI4NzM5YzlhMWJiMGY1OWE2NjUxODQ1NWQ1YTcxMTA1NGZkYzNjYzMyM2E1ODdmNzg)
 
-## Requirements
+
+# Deploying the server 
+
+Note: You can find the frontend [here](https://github.com/simon987/Much-Assembly-Required)
+
+
+## Linux (Ubuntu 16.04)
+```bash
+# Install tools
+sudo apt install git maven openjdk-8-jdk
+
+# Obtain source files
+git clone https://github.com/simon987/Much-Assembly-Required.git
+
+# Build
+cd Much-Assembly-Required
+mvn package
+
+# Run
+cd target
+java -jar server-1.2a.jar
+```
+
+## Windows
+Coming eventually...
+
+## Docker
+### Requirements  
 
 1. [Docker Compose](https://docs.docker.com/compose/install/#install-compose) (and dependencies)
 
-## Installation
+### Installation
 
 Once Docker and Docker Compose are installed, you can build and start
 this application by running the following command inside this
 application's directory:
 
-    docker-compose up
+`docker-compose up`
 
 This will start MySQL and then build and run this application. It will
 be available via http://localhost.