Merge branch 'master' of https://github.com/bubba/room-booking-tcd

Author: lukel97

README.md

@@ -1,3 +1,11 @@
 # TCD Room Booking App [![Build Status](https://travis-ci.com/Bubba/room-booking-tcd.svg?token=Wqfee95SqTKzjdVWdZ2t&branch=master)](https://travis-ci.com/Bubba/room-booking-tcd)
 
 A React based web app that books group rooms across Trinity.
+
+To install the dependencies, run `yarn` or `npm install` from the root directory.
+Then `cd client` and run the same command to install the dependencies for the client.
+
+## Setting up the development server
+
+`node server/Server.js` to set up the API server
+`cd client && yarn start` to run the React client