Fix merge with upstream master pull

README.md

@@ -1,10 +1,12 @@
 #2048-cli
 
+<<<<<<< HEAD
 A cli version/engine of the game [2048](https://github.com/gabrielecirulli/2048) for your Linux
 terminal.
 
 ![Screenshot](http://i.imgur.com/QU7t5mH.png)
 
+<<<<<<< HEAD
 There currently are 3 versions that can be run. These include a straight-forward terminal
 based, and two using the ncurses and SDL libraries. To add a new graphical version, simply
 create a .c file which implements all the functions in gfx.h and add a Makefile entry.
@@ -13,6 +15,15 @@ create a .c file which implements all the functions in gfx.h and add a Makefile
     git clone https://github.com/Tiehuis/2048-cli.git
     make
 
+You can easily install this on el >= 5 (CentOS, RedHat Enterprise Linux,
+Scientific Linux, Oracle) and Fedora >= 19 using the package-manager:
+
+    sudo yum install 2048-cli[-nocurses]
+
+For el you will need to have the
+[EPEL-repository](https://fedoraproject.org/wiki/EPEL/FAQ#How_can_I_install_the_packages_from_the_EPEL_software_repository.3F)
+enabled.
+
 ### Run
     ./2048
 
@@ -26,4 +37,5 @@ create a .c file which implements all the functions in gfx.h and add a Makefile
 Fonts used in SDL version can be found [here](www.openfontlibrary.org).
 
 ## License
-This code is licensed under the [MIT License](https://github.com/Tiehuis/2048-cli/blob/master/LICENSE).
+This code is licensed under the
+[MIT License](https://github.com/Tiehuis/2048-cli/blob/master/LICENSE).