init commit
added . files
readme conflict