commit
Merge branch 'master' of https://github.com/ixdfan/ixdfan.github.com