a little bit change
2014-11-21
Merge branch 'master' of github.com:JunyiHe/MyNoteBook