Merge remote-tracking branch 'origin/master'

Conflicts: README.md
LuqueDaniel · Jan 6, 2014 · 7e6fb7e · 7e6fb7e
2 parents ec9d0ae + 7bc7fe2
commit 7e6fb7e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,8 @@ Features
 - **New topics**: 9
 - **New researchs**: 13
 
+**[View wiki](https://github.com/LuqueDaniel/gdt-visualnovel-mod/wiki)**
+
 Screenshots
 --------------------------------------------------------------------------
 ![screenshot](https://raw.github.com/LuqueDaniel/gdt-visualnovel-mod/master/screenshots/screenshot_01.png)