update readme
fix conflicts
Merge branch 'master' of https://github.com/tikotzky/faker-rs

Conflicts:
	Cargo.toml