reset c1
Merge branch 'master' of https://github.com/noyobo/noyobo.github.com