修正格式錯誤
Merge remote-tracking branch 'colin/master'

Conflicts:
	README.md
Merge remote-tracking branch 'colin/master'
kernel configuration
Merge remote-tracking branch 'ben/master'