first local commit
Add license and readme
-Resolve conflict