testing conflict resolution
Merge pull request #5 from zhonglinyuan/master

testing conflicts
fixed merge conflict
Merge pull request #6 from GitNooby/master

got the merge