Merge pull request PokemonGoF#1 from PokemonGoF/dev

Merged upstream

Dockerfile

@@ -1,24 +1,7 @@
-FROM gliderlabs/alpine:3.4
-
-# common library
-RUN apk add --update --no-cache \
-  ca-certificates \
-  && update-ca-certificates \
-  && apk add --update --no-cache \
-    git \
-    python \
-    python-dev \
-    py-pip \
-    build-base \
-  && pip install --upgrade pip
-
+FROM namlehong/alpine-pgo-base:latest
 
 COPY requirements.txt /app/
-WORKDIR /app/
-
-# keep pip on other layer
-RUN pip install --no-cache-dir -r requirements.txt \
-  && apk del git
+RUN pip install --no-cache-dir -r requirements.txt
 
 COPY . /app
 

README.md

@@ -43,7 +43,7 @@ We use [Slack](https://slack.com) as a web chat. [Click here to join the chat!](
 
 - OS X:  `brew update && brew install --devel protobuf`
 - Windows: Download protobuf 3.0: [here](https://github.com/google/protobuf/releases/download/v3.0.0-beta-4/protoc-3.0.0-beta-4-win32.zip) and unzip `bin/protoc.exe` into a folder in your PATH.
-- Linux: `PLEASE CONTRIBUTE`
+- Linux: `apt-get install python-protobuf`
 
 ### Installation
 
@@ -134,17 +134,19 @@ This project uses Google Maps. There's one map coupled with the project, but as
 
 ## FAQ
 
+### What's IV ?
+Here's the [introduction](http://bulbapedia.bulbagarden.net/wiki/Individual_values) 
 ### Losing Starter Pokemon and others
-    You can use -c 1 to protect your first stage low CP pokemon.
+You can use -c 1 to protect your first stage low CP pokemon. 
 ### Does it run automatally?
-    Not yet, still need a trainer to train the script param. But we are very close to.
+Not yet, still need a trainer to train the script param. But we are very close to. 
 ### Set GEO Location
-    It works, use -l "xx.yyyy,zz.ttttt" to set lat long for location. -- diordache
+It works, use -l "xx.yyyy,zz.ttttt" to set lat long for location. -- diordache
 ### FLEE
-   The status code "3" corresponds to "Flee" - meaning your Pokemon has ran away.
-   {"responses": { "CATCH_POKEMON": { "status": 3 } }
+The status code "3" corresponds to "Flee" - meaning your Pokemon has ran away. 
+   {"responses": { "CATCH_POKEMON": { "status": 3 } } 
 ### My pokemon are not showing up in my Pokedex?
-   Finish the tutorial on a smartphone. This will then allow everything to be visible.
+Finish the tutorial on a smartphone. This will then allow everything to be visible.
 ### How can I maximise my XP per hour?
 Quick Tip: When using this script, use a Lucky egg to double the XP for 30 mins. You will level up much faster. A Lucky egg is obtained on level 9 and further on whilst leveling up. (from VipsForever via /r/pokemongodev)
 ### How can I not collect certain pokemon
@@ -198,6 +200,7 @@ To install the pgoapi use `pip install -e git://github.com/tejado/pgoapi.git#egg
  * sinistance
  * CapCap
  * mzupan
+ * namlehong
 
 ## Credits
 ### The works are based on the Pokemon Go API