initial commit
fixed conflict in readme