initial commit
fixed conflicts in readme