first commit
fixed the readme conflict