diff --git a/README.md b/README.md
index c04b6e3..8dd7069 100644
--- a/README.md
+++ b/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).
diff --git a/man/2048.1.txt b/man/2048.1.txt
index 50754fe..c9b0a92 100644
--- a/man/2048.1.txt
+++ b/man/2048.1.txt
@@ -36,7 +36,7 @@ OPTIONS
 
 CONTROLS
 --------
-*hjkl or *wasd* or *arrow keys*::
+*hjkl* or *wasd* or *arrow keys*::
     Movement
 *q*::
     Quit the game.
diff --git a/man/2048nc.1 b/man/2048nc.1
index d0151de..c027dcd 100644
--- a/man/2048nc.1
+++ b/man/2048nc.1
@@ -2,12 +2,12 @@
 .\"     Title: \e20\e4\e8nc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 12/05/2014
+.\"      Date: 12/13/2014
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "\E20\E4\E8NC" "1" "12/05/2014" "\ \&" "\ \&"
+.TH "\E20\E4\E8NC" "1" "12/13/2014" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------