Initial commit
Fixed README conflict