Fixed readme and license files from merging.