add 140912
Merge branch 'master' of https://github.com/narnars0/MyRepository