conflict1
Merge pull request #25 from hao1987/MY_conflict1

conflict1
shaggydog
fix conflicts