added license and readme
resolved conflict in readme