translating by whatever1992
translated
translated
Merge branch 'master' of https://github.com/LCTT/TranslateProject

Conflicts:
	sources/Daily Ubuntu Tips – Change Samba Workgroup And Computer Name.md
	translated/Daily Ubuntu Tips – Change Samba Workgroup And Computer Name.md
translating by whatever1992
translated by whatever1992
已校对 by小眼儿
已校对 by小眼儿
20131126-5 选题 linux 命令 cat
校对中 by小眼儿
已校对 by小眼儿
已校对 by小眼儿
已校对 by小眼儿
20131126-6 选题 linux 命令 uptime
20131126-7 选题 一个小游戏
hongchuntang translating
校对中
Update Mark Shuttleworth Regrets the “Tea Party” Remarks and Other Canonical Mistakes.md
已校对
已校对