2014-09-29 update
Merge branch 'master' of https://github.com/icshs1/study