adding files to new repo
readme changes
readme conflict fix