Initial commit
corrected README conflict