initial commit
add readme
add license
merge conflicts