Merge pull request #35 from codepiano/master

continue 2014/01/18
remove confilct file
daily translating patch jan 19
daily transalting patch jan 20
daily translating patch jan 21
daily translating patch jan 22
daily translating patch jan 23
dailly translating patch jan 24
初次尝试
Merge pull request #37 from spacewander/master

初次尝试
transalting dail ypatch jan 25
daily translating patch jan 26
transalting dail patch jan27
daily translating patch  jan 28
pull from commandlinefu.com
daily translating patch jan 29
daily transalting patch jan 30
daily translating patch jan 31
daily translating patch feb 1
daily translating patch feb 2