first commit!
fixed merge conflict in readme