add b
Merge branch 'master' of github.com:ckm111/git_hw2 into ckm

pull
add c
fix conflict
make conflict
make conflict2
make conflict3
Merge pull request #1 from ckm111/ckm

Ckm