From: Mario <zacjardine@y7mail.com>
Date: Sat, 24 Dec 2016 01:58:26 +0000 (+0000)
Subject: Merge branch 'detrate/feature/README' into 'master'
X-Git-Tag: xonotic-v0.8.2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2de4593a371231cbc95023a812efd6808d4175e9;p=xonotic%2Fxonotic.git

Merge branch 'detrate/feature/README' into 'master'

Added a README.md to provide quick info about the game and community.

See merge request !21
---

2de4593a371231cbc95023a812efd6808d4175e9