fixed

Conflicts:
README.md
changed readme