fix conflicts
One style for blocks readme
update configs
fix paragraph readme
fix paragraph en readme
Merge pull request #4 from verybigman/master

merge from original repo