From cfaf46ad5212de2e20798371b8c7c0fa8e343fe0 Mon Sep 17 00:00:00 2001
From: sg495 <sg495@users.noreply.github.com>
Date: Wed, 3 Jan 2018 17:59:46 +0100
Subject: [PATCH 1/2] Added installation instructions for Windows (tested on
 Windows 10).

---
 README.md | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fb75a06..96dea1f 100644
--- a/README.md
+++ b/README.md
@@ -33,8 +33,38 @@ cd target
 java -jar server-1.2a.jar
 ```
 
-## Windows
-Coming eventually...
+## Windows (tested on 10)
+
+Installation instructions:
+1. Download the JDK from [here](http://www.oracle.com/technetwork/java/javase/downloads/index.html).
+Install the JDK and update your PATH and JAVA_HOME enviroment variables.
+2. Download Maven from [here](https://maven.apache.org/).
+Install Maven (following the README) and update your PATH enviroment variable.
+3. Download Mongo DB Community from [here](https://www.mongodb.com/download-center#community).
+Install Mongo DB following the instructions [here](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-windows/).
+Update your PATH enviroment variable.
+
+Building instructions:
+```batch
+:: Builds the server
+cd Much-Assembly-Required
+mvn package
+```
+
+Running instructions:
+1. In one Command Prompt window, run Mongo DB:
+```batch
+:: Runs Mongo DB
+mongod
+```
+2. In a second Command Prompt window, run the MAR server:
+```batch
+:: Runs the MAR server
+cd Much-Assembly-Required\target
+java -jar server-1.2a.jar
+```
+
+
 
 ## Docker
 ### Requirements  

From 58a378d77fcd5099ad83d049b0870ae39e9132ad Mon Sep 17 00:00:00 2001
From: sg495 <sg495@users.noreply.github.com>
Date: Wed, 3 Jan 2018 20:14:31 +0100
Subject: [PATCH 2/2] Updated instructions for Windows installation and
 running.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 96dea1f..0affdd2 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ cd target
 java -jar server-1.2a.jar
 ```
 
-## Windows (tested on 10)
+## Windows (tested on Windows 10)
 
 Installation instructions:
 1. Download the JDK from [here](http://www.oracle.com/technetwork/java/javase/downloads/index.html).
@@ -63,7 +63,7 @@ mongod
 cd Much-Assembly-Required\target
 java -jar server-1.2a.jar
 ```
-
+3. Run the frontend, following the instructions that you can find [here](https://github.com/simon987/Much-Assembly-Required-Frontend).
 
 
 ## Docker