changed A
Merge pull request #1 from YanLi2016/ourbranch

changed A