initial commit
solved README conflicts