给g1
Merge branch '1.1' of git://github.com/menxu/pin-2012-edu into 1.1
Add i1, j1, j2, k1 demo
merge