Merge remote-tracking branch 'origin/master'

# Conflicts: # README.md
suhrmann · Mar 27, 2016 · bafb243 · bafb243
2 parents 38b42d2 + f908f27
commit bafb243
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,6 @@
+# Jack Danger Pokemon
+## My contribution to the #gppcc8.
+
+### Installieren
 1. Framework runterladen (stand 17.05.2016): http://www.lets-gamedev.de/JackDanger-v3.zip
 2. Das repo im root-Ordner clonen (erzeugt den Ordner ./games/pokemon)