update
Merge branch 'master' of https://github.com/cutehalo/cutehalo.github.com