confict fixed
tree: 60ca739e21094cd07f7d0330488f46c8642db606
  1. LICENSE.txt
  2. readme.txt