initial commit
updated license and readme
fixed conflict