Merge conflict
Merge branch 'master' of github.com:CipherChen/cipherchen.github.com