Merge branch 'master' of git://github.com/bay6/books-share

Conflicts: README.markdown
bay6 · Jun 14, 2013 · fae1c7f · fae1c7f
2 parents 645512d + f4bde5a
commit fae1c7f
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/README.markdown b/README.markdown
@@ -28,3 +28,10 @@ vps(ip): http://198.199.86.209:9000
 * sudo apt-get update
 * sudo apt-get install pdf2htmlEX
 * pdf2htmlEX -v
+=======
+## Changed Log
+
+06/11/2013 redeploy vps with the avatar uploaded<br/>
+![avatar](https://f.cloud.github.com/assets/83296/636756/de67749a-d28f-11e2-92fd-0311b1a680de.png)
+
+06/14/2013 add read online function<br/>