initial commit
modified README
conflict... really?