First commit
Fix merge conflict in readme