first commit
fixed conflicts in readme