Merge branch 'master' of https://github.com/ourochan/secret
Merge branch 'master' of https://github.com/ourochan/secret