Merge pull request #1 from kenvifire/master

Merge branch from 朱伟杰
Merge pull request #2 from kenvifire/master

Scala school 第一节
review by Stephanie - 2013.3.3
merge