added files to repo
readme change
fixed conflict