update readme.md to show new screenshot
trying to solve conflict
Merge pull request #9 from senlin/master

solve conflict