All the code committed
Merge branch 'master' of https://github.com/KongYue/nick-wang