初始版本，2013-11-2 by joim
Merge branch 'master' of git@github.com:yanzi1225627/meditation_git.git