new file:   chapters/.gitignore

See merge request csdn/intro-ossd!24

	modified:   chapters/1.md

Master

See merge request csdn/intro-ossd!23

fix error

增加了开源的领域知识

See merge request csdn/intro-ossd!22

new pptx

See merge request csdn/intro-ossd!21

New2

See merge request csdn/intro-ossd!20

update story

See merge request csdn/intro-ossd!19

modified:   chapters/1.md

See merge request csdn/intro-ossd!18

new file:   chapters/KenThompson.md

update files

See merge request !17

Master

See merge request csdn/intro-ossd!16

Master

See merge request csdn/intro-ossd!15

	modified:   plan/1.md

chapters/1.md

	modified:   plan/1.md

update chapter

See merge request csdn/intro-ossd!14

Master

See merge request csdn/intro-ossd!13

resolve conflict

See merge request csdn/intro-ossd!12

Signed-off-by: “ZouXin” <xinzou@yahoo.com>