merge b1 and master

YanZhao · Oct 15, 2010 · 2164ffa · 2164ffa
2 parents 30e44e6 + 115a3d7
commit 2164ffa
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/README b/README
@@ -2,4 +2,6 @@ Are your hands dirty? :)
 Enjoy a cup of coffee and music now, Let's go further. are you ready?
 1)������ʦ  ��ѧ�� 
 2)second commit from office computer.
-3)in master
+3)in master
+4)in b1
+