merge conflict test
add pic
Merge pull request #3 from norrislee/master

add pic