Update readme
conflict solved
Merge pull request #6 from kuopo/b2

use b2 to update origin master