teaching plan new
Merge branch '1.1' of github.com:menxu/pin-2012-edu into 1.1