initial commit
fix conflicts readme and license