Initial commit
Merge branch 'master' of https://github.com/xqopxcat/git0614-2