Merge pull request #1 from LCTT/master

Merge from base
20141229 选题 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md
translated 20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md
Merge pull request #2166 from ZhouJ-sh/master

20141229 选题 2 Ways To Fix The UEFI Bootloader When Dual Booting Windo…